Merge pull request #1032 from vktr/feature/fix-restore-window-bug

Only call Restore if IsIconized
picotorrent · Nov 23, 2020 · cfe927b · cfe927b
2 parents 688721e + a6f1c18
commit cfe927b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/picotorrent/ipc/applicationoptionsconnection.cpp b/src/picotorrent/ipc/applicationoptionsconnection.cpp
@@ -33,7 +33,12 @@ bool ApplicationOptionsConnection::OnExecute(const wxString&, const void *data,
             }
 
             m_frame->MSWGetTaskBarButton()->Show();
-            m_frame->Restore();
+
+            if (m_frame->IsIconized())
+            {
+                m_frame->Restore();
+            }
+
             m_frame->Raise();
             m_frame->Show();
             m_frame->HandleParams(j["files"], j["magnet_links"]);

diff --git a/src/picotorrent/ui/mainframe.cpp b/src/picotorrent/ui/mainframe.cpp
@@ -782,7 +782,12 @@ void MainFrame::OnIconize(wxIconizeEvent& ev)
 void MainFrame::OnTaskBarLeftDown(wxTaskBarIconEvent&)
 {
     this->MSWGetTaskBarButton()->Show();
-    this->Restore();
+
+    if (this->IsIconized())
+    {
+        this->Restore();
+    }
+
     this->Raise();
     this->Show();
     this->SendSizeEvent();