Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

[modules/shaper.git] / src / XGUI / XGUI_Workshop.cpp

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index f3ac95d98e222d23cba387e0a7cfba64caca25e7..20f4e47c7bc6e25184a512f58fdd12f54bfc6543 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -473,8 +473,9 @@ void XGUI_Workshop::onUndo()
   objectBrowser()->setCurrentIndex(QModelIndex());
   boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
   boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
-  if (!operationMgr()->abortOperation())
-    return;
+  //if (!operationMgr()->abortOperation())
+  //  return;
+  operationMgr()->abortOperation();
   aDoc->undo();
   updateCommandStatus();
 }