Mercurial Repositories > eric / changeset

--- a/Debugger/DebugServer.py	Sat May 19 17:56:11 2018 +0200
+++ b/Debugger/DebugServer.py	Sun May 20 14:17:45 2018 +0200
@@ -508,8 +508,8 @@
                 elif self.__autoClearShell:
                     self.__autoClearShell = False
                     self.remoteBanner()
-                self.remoteClientVariables(0, [], 0)
-                self.remoteClientVariables(1, [], 0)
+##                self.remoteClientVariables(0, [], 0)
+##                self.remoteClientVariables(1, [], 0)
             else:
                 if clType and self.lastClientType:
                     self.__setClientType(self.lastClientType)

--- a/Preferences/__init__.py	Sat May 19 17:56:11 2018 +0200
+++ b/Preferences/__init__.py	Sun May 20 14:17:45 2018 +0200
@@ -1649,6 +1649,11 @@
         dn.mkdir(".eric6")
     QCoreApplication.setOrganizationName(settingsNameOrganization)
     QCoreApplication.setApplicationName(settingsNameGlobal)
+    try:
+        Prefs.settings.setAtomicSyncRequired(False)
+    except AttributeError:
+        # backward compatibility fot Qt < 5.10
+        pass
     
     # Avoid nasty behavior of QSettings in combination with Py2
     Prefs.settings.value("UI/SingleApplicationMode")
@@ -2002,13 +2007,13 @@
         else:
             return prefClass.uiDefaults[key]
     elif key in "ViewProfiles2":
-        profiles = prefClass.settings.value("UI/ViewProfiles2")
-        if profiles is None:
+        profilesStr = prefClass.settings.value("UI/ViewProfiles2")
+        if profilesStr is None:
             # use the defaults
             viewProfiles = prefClass.uiDefaults["ViewProfiles2"]
         else:
             viewProfiles = {}
-            profiles = json.loads(profiles)
+            profiles = json.loads(profilesStr)
             for name in ["edit", "debug"]:
                 viewProfiles[name] = [
                     QByteArray.fromBase64(profiles[name][0].encode("utf-8")),

--- a/UI/UserInterface.py	Sat May 19 17:56:11 2018 +0200
+++ b/UI/UserInterface.py	Sun May 20 14:17:45 2018 +0200
@@ -637,6 +637,9 @@
         self.toolbarManager.restoreState(
             Preferences.getUI("ToolbarManagerState"))
         
+        # finalize the initialization of the code documentation viewer
+        self.codeDocumentationViewer.finalizeSetup()
+        
         # now activate the initial view profile
         splash.showMessage(self.tr("Setting View Profile..."))
         self.__setEditProfile()
@@ -680,9 +683,6 @@
         if interval > 0:
             QApplication.setKeyboardInputInterval(interval)
         
-        # finalize the initialization of the code documentation viewer
-        self.codeDocumentationViewer.finalizeSetup()
-        
     def __createLayout(self, debugServer):
         """
         Private method to create the layout of the various windows.