summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Daemon/MiddleWare.cpp4
-rw-r--r--src/Gui/SettingsDialog.py11
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index f69c8a3..2786938 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -688,7 +688,9 @@ static mw_result_t SavePackageDescriptionToDebugDump(
dd.Open(pDebugDumpDir);
dd.SaveText(FILENAME_PACKAGE, package.c_str());
dd.SaveText(FILENAME_DESCRIPTION, description.c_str());
- dd.SaveText(FILENAME_COMPONENT, component.c_str());
+ /* For oopses, pExecutable == "kernel" gives "" here. Don't write it */
+ if (component.size() != 0)
+ dd.SaveText(FILENAME_COMPONENT, component.c_str());
}
catch (CABRTException& e)
{
diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py
index 893c23f..a69a68e 100644
--- a/src/Gui/SettingsDialog.py
+++ b/src/Gui/SettingsDialog.py
@@ -103,10 +103,13 @@ class SettingsDialog:
## MaxCrashSize
self.builder.get_object("sbMaxCrashReportsSize").set_value(float(common["MaxCrashReportsSize"]))
## GPG keys
- self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
- self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
- for gpgkey in self.gpgkeys:
- self.GPGKeysListStore.append([gpgkey])
+ try:
+ self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
+ self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
+ for gpgkey in self.gpgkeys:
+ self.GPGKeysListStore.append([gpgkey])
+ except:
+ pass
## blacklist
self.builder.get_object("eBlacklist").set_text(common["BlackList"])