Merge branch 'master' of gitlab.com:wilfredor2/inkscape

2 files changed, 13 insertions, 11 deletions

diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 619e7ec37..3391864ae 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -325,16 +325,15 @@ SPCurve::is_closed() const
 {
     if (is_empty()) {
         return false;
-    } else {
-        bool closed = true;
-        for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); ++it) {
-             if ( ! it->closed() ) {
-                closed = false;
-                break;
-            }
+    } 
+    
+    for (Geom::PathVector::const_iterator it = _pathv.begin(); it != _pathv.end(); ++it) {
+        if ( ! it->closed() ) {
+            return false;
         }
-        return closed;
     }
+    
+    return true;    
 }
 
 /**
@@ -345,9 +344,12 @@ SPCurve::is_equal(SPCurve * other) const
 {
     if(other == nullptr) {
         return false;
-    } else if(_pathv == other->get_pathvector()){
+    } 
+
+    if(_pathv == other->get_pathvector()){
         return true;
     }
+    
     return false;
 }
 
diff --git a/src/display/grayscale.cpp b/src/display/grayscale.cpp
index f00157c9d..fb77dfa87 100644
--- a/src/display/grayscale.cpp
+++ b/src/display/grayscale.cpp
@@ -85,9 +85,9 @@ unsigned char luminance(unsigned char r, unsigned char g, unsigned char b) {
 bool activeDesktopIsGrayscale() {
     if (SP_ACTIVE_DESKTOP) {
         return (SP_ACTIVE_DESKTOP->getColorMode() == Inkscape::COLORMODE_GRAYSCALE);
-    } else {
-        return false;
     }
+    
+    return false;
 }