From c6e305343c2659b206f10c16655102c6d53a0714 Mon Sep 17 00:00:00 2001
From: "Michal Krenek (Mikos)" <m.krenek@gmail.com>
Date: Thu, 30 Mar 2017 16:17:03 +0200
Subject: [PATCH] Unhide console on Windows right before exit (we don't want to
 leave zombies behind)

---
 qspectrumanalyzer/__main__.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/qspectrumanalyzer/__main__.py b/qspectrumanalyzer/__main__.py
index d651b37..dc00a6d 100644
--- a/qspectrumanalyzer/__main__.py
+++ b/qspectrumanalyzer/__main__.py
@@ -632,19 +632,23 @@ def main():
     args, unparsed_args = parser.parse_known_args()
     debug = args.debug
 
-    # Hide console window on Windows
-    if sys.platform == 'win32' and not debug:
-        from qspectrumanalyzer import windows
-        if windows.is_attached_console_visible():
+    try:
+        # Hide console window on Windows
+        if sys.platform == 'win32' and not debug:
+            from qspectrumanalyzer import windows
             windows.set_attached_console_visible(False)
 
-    # Start PyQt application
-    app = QtWidgets.QApplication(sys.argv[:1] + unparsed_args)
-    app.setOrganizationName("QSpectrumAnalyzer")
-    app.setOrganizationDomain("qspectrumanalyzer.eutopia.cz")
-    app.setApplicationName("QSpectrumAnalyzer")
-    window = QSpectrumAnalyzerMainWindow()
-    sys.exit(app.exec_())
+        # Start PyQt application
+        app = QtWidgets.QApplication(sys.argv[:1] + unparsed_args)
+        app.setOrganizationName("QSpectrumAnalyzer")
+        app.setOrganizationDomain("qspectrumanalyzer.eutopia.cz")
+        app.setApplicationName("QSpectrumAnalyzer")
+        window = QSpectrumAnalyzerMainWindow()
+        sys.exit(app.exec_())
+    finally:
+        # Unhide console window on Windows (we don't want to leave zombies behind)
+        if sys.platform == 'win32' and not debug:
+            windows.set_attached_console_visible(True)
 
 
 if __name__ == "__main__":