Merge lp:~veebers/checkbox/remove_conditional_memory_leak into lp:checkbox

[Christopher Lee]

Assign to settings once to avoid conditional memory leak

Assigning to 'Settings* settings' then conditionally re-assigning results in leaked memory. (Unless there is some Qt memory management magic happening here that I've missed).

[Sylvain Pineau (sylvain-pineau)]

That's indeed a much clever way. thanks.

review: Approve

=== modified file 'checkbox-gui/checkbox-gui/main.cpp'
--- checkbox-gui/checkbox-gui/main.cpp	2014-04-01 23:23:44 +0000
+++ checkbox-gui/checkbox-gui/main.cpp	2015-07-30 03:07:36 +0000
@@ -63,9 +63,10 @@
     guiengine.Initialise();
 
     Settings* settings;
-    settings = new Settings();
     if (app.arguments().size() > 1) {
         settings = new Settings(app.arguments().at(1));
+    } else {
+        settings = new Settings();
     }
     viewer.rootContext()->setContextProperty("settings", settings);