Show all windows when torrent add dialog is created

equeim · Dec 1, 2023 · ed71738 · ed71738
1 parent 906a609
commit ed71738
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/ui/screens/mainwindow/mainwindow.cpp b/src/ui/screens/mainwindow/mainwindow.cpp
@@ -393,15 +393,13 @@ namespace tremotesf {
             mConnectionDependentActions.push_back(&mAddTorrentFileAction);
 
             QObject::connect(&mAddTorrentLinkAction, &QAction::triggered, this, [this] {
-                mWindow->setWindowState(mWindow->windowState() & ~Qt::WindowMinimized);
                 auto showDialog = [this] {
-                    auto dialog =
-                        new AddTorrentDialog(mViewModel.rpc(), QString(), AddTorrentDialog::Mode::Url, mWindow);
+                    auto dialog = new AddTorrentDialog(mViewModel.rpc(), QString(), AddTorrentDialog::Mode::Url);
                     dialog->setAttribute(Qt::WA_DeleteOnClose);
                     dialog->show();
                 };
                 if (mWindow->isHidden()) {
-                    mWindow->show();
+                    showWindowsAndActivateMainOrDialog();
                     runAfterDelay(showDialog);
                 } else {
                     showDialog();
@@ -707,8 +705,6 @@ namespace tremotesf {
         }
 
         void addTorrentsFiles() {
-            mWindow->setWindowState(mWindow->windowState() & ~Qt::WindowMinimized);
-
             auto showDialog = [this] {
                 auto settings = Settings::instance();
                 auto directory = settings->rememberOpenTorrentDir() ? settings->lastOpenTorrentDirectory() : QString{};
@@ -738,7 +734,7 @@ namespace tremotesf {
             };
 
             if (mWindow->isHidden()) {
-                mWindow->show();
+                showWindowsAndActivateMainOrDialog();
                 runAfterDelay(showDialog);
             } else {
                 showDialog();