GUI: Fix for initializing default application.

kimmov · kimmov · commit ece896a13d87 · 2011-02-25T18:01:23.000+02:00
diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp
@@ -63,7 +63,6 @@ void ApplicationList::LoadSettings(QSettings *programSettings)
                 defapp = 0;
                 break;
             }
-            // use as default for windows environments
             if (FindDefaultWindowsEditor())
             {
                 defapp = 0;
@@ -76,10 +75,14 @@ void ApplicationList::LoadSettings(QSettings *programSettings)
     if (names.size() > 0 && (names.size() == paths.size()))
     {
         for (int i = 0; i < names.size(); i++)
-        {
             AddApplication(names[i], paths[i]);
-        }
-        mDefaultApplicationIndex = 1;
+
+        if (defapp == -1)
+            mDefaultApplicationIndex = 0;
+        else if (defapp < names.size())
+            mDefaultApplicationIndex = defapp;
+        else
+            mDefaultApplicationIndex = 0;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ void ApplicationList::LoadSettings(QSettings *programSettings)`
`63`	`63`	`defapp = 0;`
`64`	`64`	`break;`
`65`	`65`	`}`
`66`		`- // use as default for windows environments`
`67`	`66`	`if (FindDefaultWindowsEditor())`
`68`	`67`	`{`
`69`	`68`	`defapp = 0;`
`@@ -76,10 +75,14 @@ void ApplicationList::LoadSettings(QSettings *programSettings)`
`76`	`75`	`if (names.size() > 0 && (names.size() == paths.size()))`
`77`	`76`	`{`
`78`	`77`	`for (int i = 0; i < names.size(); i++)`
`79`		`- {`
`80`	`78`	`AddApplication(names[i], paths[i]);`
`81`		`- }`
`82`		`- mDefaultApplicationIndex = 1;`
	`79`	`+`
	`80`	`+ if (defapp == -1)`
	`81`	`+ mDefaultApplicationIndex = 0;`
	`82`	`+ else if (defapp < names.size())`
	`83`	`+ mDefaultApplicationIndex = defapp;`
	`84`	`+ else`
	`85`	`+ mDefaultApplicationIndex = 0;`
`83`	`86`	`}`
`84`	`87`	`}`
`85`	`88`