Bugfixing form portal

mersadk · Apr 16, 2024 · e73d9f3 · e73d9f3
1 parent 5d0cd61
commit e73d9f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/DWSIM.ProFeatures/FormPortal.cs b/DWSIM.ProFeatures/FormPortal.cs
@@ -96,7 +96,7 @@ private void TrialLicenseCreatedLogic()
         }
         private void Timer1_Tick()
         {
-            if (TrialLicenseCreatedMessageCount + 1 <= TrialLicenseCreatedMessages.Count)
+            if (TrialLicenseCreatedMessageCount + 1 < TrialLicenseCreatedMessages.Count)
             {
                 TrialLicenseCreatedMessageCount += 1;
                 this.UIThread(() =>

diff --git a/DWSIM/Forms/MainWindow/FormMain.vb b/DWSIM/Forms/MainWindow/FormMain.vb
@@ -4928,7 +4928,15 @@ Label_00CC:
     End Sub
 
     Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles tsmiFreeProTrial.Click
-        Functions.DisplayTransitionForm(Nothing, "Access DWSIM Pro now", True)
+        Dim userService As UserService = UserService.GetInstance()
+        Dim isLoggedIn As Boolean = userService._IsLoggedIn()
+        If isLoggedIn Then
+            Functions.DisplayTransitionForm(Nothing, "Access DWSIM Pro now", True)
+        Else
+            Dim loginForm = New LoginForm()
+            loginForm.ShowDialog()
+        End If
+
     End Sub
 
     Private Sub AbrirDoDashboardToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AbrirDoDashboardToolStripMenuItem.Click