From 3dc611f3dfe054594f22e1e4fe414abffd5d4605 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 18 Dec 2016 13:10:07 +0100
Subject: [PATCH] fix CIDs 154872, 152491, 129453

---
 src/Gui/TaskView/TaskWatcher.cpp | 1 -
 src/Gui/ViewProvider.cpp         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp
index aeb215dbf4..d521ec892f 100644
--- a/src/Gui/TaskView/TaskWatcher.cpp
+++ b/src/Gui/TaskView/TaskWatcher.cpp
@@ -92,7 +92,6 @@ TaskWatcherCommands::TaskWatcherCommands(const char* Filter,const char* commands
             (BitmapFactory().pixmap(pixmap), trUtf8(name), true, 0);
 
         for (const char** i=commands;*i;i++) {
-            if(!i) break;
             Command *c = mgr.getCommandByName(*i);
             if (c) {
                 // handled in TaskBox::actionEvent()
diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp
index 7aeaacabd8..0c4147ce5d 100644
--- a/src/Gui/ViewProvider.cpp
+++ b/src/Gui/ViewProvider.cpp
@@ -539,7 +539,7 @@ bool ViewProvider::onDelete(const vector< string >& subNames) {
     bool del = true;
     auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
     for(Gui::ViewProviderExtension* ext : vector)
-        del = del || ext->extensionOnDelete(subNames);
+        del &= ext->extensionOnDelete(subNames);
 
     return del;
 }