Merge tag 'v2.1.6' into debian/sid

1 files changed, 22 insertions, 2 deletions

diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp
index 7b7623b..efd453d 100644
--- a/src/gui/mainmenu.cpp
+++ b/src/gui/mainmenu.cpp
@@ -239,6 +239,24 @@ void MainMenu::on_actionMerge_Nodes_triggered()
         tikzit->activeWindow()->tikzScene()->mergeNodes();
 }
 
+void MainMenu::on_actionMake_Path_triggered()
+{
+    if (tikzit->activeWindow() != 0)
+        tikzit->activeWindow()->tikzScene()->makePath(false);
+}
+
+void MainMenu::on_actionMake_Path_as_Background_triggered()
+{
+    if (tikzit->activeWindow() != 0)
+        tikzit->activeWindow()->tikzScene()->makePath(true);
+}
+
+void MainMenu::on_actionSplit_Path_triggered()
+{
+    if (tikzit->activeWindow() != 0)
+        tikzit->activeWindow()->tikzScene()->splitPath();
+}
+
 
 // Tikz
 void MainMenu::on_actionParse_triggered()
@@ -333,8 +351,10 @@ void MainMenu::on_actionZoom_Out_triggered()
 
 void MainMenu::on_actionShow_Node_Labels_triggered()
 {
-    tikzit->activeWindow()->tikzScene()->setDrawNodeLabels(ui.actionShow_Node_Labels->isChecked());
-    tikzit->activeWindow()->tikzScene()->invalidate();
+    if (tikzit->activeWindow() != 0) {
+        tikzit->activeWindow()->tikzScene()->setDrawNodeLabels(ui.actionShow_Node_Labels->isChecked());
+        tikzit->activeWindow()->tikzScene()->invalidate();
+    }
 }
 
 void MainMenu::on_actionAbout_triggered()