Merge branch 'master' into develop1044ImplementTOTPFromQRCode

mooltipass · Mar 29, 2024 · 7721a95 · 7721a95
2 parents 2bf6c3d + 48015ad
commit 7721a95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/AppGui.cpp b/src/AppGui.cpp
@@ -839,13 +839,6 @@ void AppGui::createMainWindow()
 
     win = new MainWindow(wsClient, dbMasterController);
 
-#ifdef Q_OS_UNIX
-    // Force resize and reset maximumWidth
-    // This fixes a crash on some Gnome+Wayland platforms
-    win->resize(0,0);
-    win->setMaximumWidth(win->width());
-#endif
-
     connect(win, &MainWindow::destroyed, [this](QObject *)
     {
         win = nullptr;

diff --git a/src/CredentialsManagement.cpp b/src/CredentialsManagement.cpp
@@ -504,8 +504,15 @@ void CredentialsManagement::onPasswordUnlocked(const QString & service, const QS
             }
             if (serviceMatch && login == selectedLogin->name())
             {
-                m_pCredModel->setClearTextPassword(parsedService, login, password);
-                ui->credDisplayPasswordInput->setText(password);
+                const auto loginPassword = selectedLogin->password();
+                QString passwordToUse = password;
+                if (!loginPassword.isEmpty() && loginPassword != password)
+                {
+                    // Password was changed in MMM, display the changed password
+                    passwordToUse = loginPassword;
+                }
+                m_pCredModel->setClearTextPassword(parsedService, login, passwordToUse);
+                ui->credDisplayPasswordInput->setText(passwordToUse);
                 ui->credDisplayPasswordInput->setLocked(false);
             }
         }

diff --git a/win/installer.iss b/win/installer.iss
@@ -53,7 +53,7 @@ Name: "Full"; Description: "Full installation"
 Name: "moolticute"; Description: "Moolticute"; Types: Full
 
 [Run]
-Filename: "{app}\moolticute.exe"; WorkingDir: "{app}"; Description: "Start Moolticute"; Flags: postinstall nowait runascurrentuser
+Filename: "{app}\moolticute.exe"; WorkingDir: "{app}"; Description: "Start Moolticute"; Flags: postinstall nowait runascurrentuser skipifsilent
 
 [Registry]
 Root: "HKCU"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Moolticute"; ValueData: "{app}\moolticute.exe --autolaunched"; Flags: uninsdeletevalue