Merge branch 'scribblemaniac-quickfix-norepeat'. Closes #57.

dalboris · Feb 11, 2016 · cd01138 · cd01138
2 parents 735b11b + 6b0faf3
commit cd01138
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/Gui/UpdateCheck.cpp b/src/Gui/UpdateCheck.cpp
@@ -22,18 +22,10 @@ UpdateCheck::UpdateCheck(QWidget * parent) :
 {
     // Initialize variables
     versionToCheck_ = global()->settings().checkVersion();
-    networkManager_ = new QNetworkAccessManager();
-    parent_ = parent;
-
-    checkForUpdates();
-}
-
-UpdateCheck::UpdateCheck(Version configVersion, QWidget * parent) :
-    reply_(0),
-    isReady_(false)
-{
-    // Initialize variables
-    versionToCheck_ = configVersion;
+    if(versionToCheck_ < Version(qApp->applicationVersion()) && versionToCheck_ != Version()) {
+        global()->settings().setCheckVersion(Version(qApp->applicationVersion()));
+        versionToCheck_ = global()->settings().checkVersion();
+    }
     networkManager_ = new QNetworkAccessManager();
     parent_ = parent;
 

diff --git a/src/Gui/UpdateCheck.h b/src/Gui/UpdateCheck.h
@@ -24,7 +24,6 @@ class UpdateCheck: public QObject
 
 public:
     UpdateCheck(QWidget * parent = 0);
-    UpdateCheck(Version configVersion, QWidget * parent = 0);
     virtual ~UpdateCheck();
 
     Version versionChecked() const;

diff --git a/src/Gui/VectorAnimationComplex/BoundingBox.cpp b/src/Gui/VectorAnimationComplex/BoundingBox.cpp
@@ -23,7 +23,7 @@ inline bool isnan_(double x)
 #ifdef WIN32
     return x != x;
 #else
-    return std::isnan(res);
+    return std::isnan(x);
 #endif
 }