Merge branch 'master' into gtk3

2016-10-16 23:38:04 +02:00
parent 4efae5c764 ed42b1239c
commit bb9c184af7
34 changed files with 156 additions and 1021 deletions
--- a/rtengine/dfmanager.cc
+++ b/rtengine/dfmanager.cc
@@ -36,16 +36,18 @@ extern const Settings* settings;

 inline dfInfo& dfInfo::operator =(const dfInfo &o)
 {
-    pathname = o.pathname;
-    maker = o.maker;
-    model = o.model;
-    iso = o.iso;
-    shutter = o.shutter;
-    timestamp = o.timestamp;
+    if (this != &o) {
+        pathname = o.pathname;
+        maker = o.maker;
+        model = o.model;
+        iso = o.iso;
+        shutter = o.shutter;
+        timestamp = o.timestamp;

-    if( ri ) {
-        delete ri;
-        ri = NULL;
+        if( ri ) {
+            delete ri;
+            ri = NULL;
+        }
    }

    return *this;