Merge remote-tracking branch 'ivan/bug/3152_logger-window-toggle-fix' into develop

2 files changed, 11 insertions, 2 deletions

diff --git a/src/leap/gui/loggerwindow.py b/src/leap/gui/loggerwindow.py
index dc1e273d..4d24a7d8 100644
--- a/src/leap/gui/loggerwindow.py
+++ b/src/leap/gui/loggerwindow.py
@@ -28,7 +28,7 @@ from leap.util.leap_log_handler import LeapLogHandler
 logger = logging.getLogger(__name__)
 
 
-class LoggerWindow(QtGui.QWidget):
+class LoggerWindow(QtGui.QDialog):
     """
     Window that displays a history of the logged messages in the app.
     """
@@ -39,7 +39,7 @@ class LoggerWindow(QtGui.QWidget):
         :param handler: Custom handler that supports history and signal.
         :type handler: LeapLogHandler.
         """
-        QtGui.QWidget.__init__(self)
+        QtGui.QDialog.__init__(self)
         leap_assert(handler, "We need a handler for the logger window")
         leap_assert_type(handler, LeapLogHandler)
 
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 4874de80..ba546fd0 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -369,6 +369,15 @@ class MainWindow(QtGui.QMainWindow):
             self._logger_window.setVisible(not self._logger_window.isVisible())
             self.ui.btnShowLog.setChecked(self._logger_window.isVisible())
 
+        self._logger_window.finished.connect(self._uncheck_logger_button)
+
+    def _uncheck_logger_button(self):
+        """
+        SLOT
+        Sets the checked state of the loggerwindow button to false.
+        """
+        self.ui.btnShowLog.setChecked(False)
+
     def _new_updates_available(self, req):
         """
         Callback for the new updates event