From fb9ff6e016e402478ea7a3d4bf0e5a1fb848d90d Mon Sep 17 00:00:00 2001
From: Nex Pro <nexial.protagonist@googlemail.com>
Date: Mon, 11 May 2015 18:50:54 +0100
Subject: [PATCH] In some cases when the addMenuItem function was called the
 separator boolean was true by default. This fix addresses this issue by
 setting it to false.

---
 libraries/script-engine/src/MenuItemProperties.cpp | 13 ++++++++-----
 libraries/script-engine/src/MenuItemProperties.h   |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/script-engine/src/MenuItemProperties.cpp b/libraries/script-engine/src/MenuItemProperties.cpp
index 97fbdef1fa..7015f0abe3 100644
--- a/libraries/script-engine/src/MenuItemProperties.cpp
+++ b/libraries/script-engine/src/MenuItemProperties.cpp
@@ -23,12 +23,13 @@ MenuItemProperties::MenuItemProperties() :
     beforeItem(""),
     afterItem(""),
     isCheckable(false),
-    isChecked(false)
+    isChecked(false),
+    isSeparator(false)
 {
 };
 
 MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName,
-                        const QString& shortcutKey, bool checkable, bool checked) :
+                        const QString& shortcutKey, bool checkable, bool checked, bool separator) :
     menuName(menuName),
     menuItemName(menuItemName),
     shortcutKey(shortcutKey),
@@ -38,12 +39,13 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
     beforeItem(""),
     afterItem(""),
     isCheckable(checkable),
-    isChecked(checked)
+    isChecked(checked),
+    isSeparator(separator)
 {
 }
 
 MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName, 
-                        const KeyEvent& shortcutKeyEvent, bool checkable, bool checked) :
+                        const KeyEvent& shortcutKeyEvent, bool checkable, bool checked, bool separator) :
     menuName(menuName),
     menuItemName(menuItemName),
     shortcutKey(""),
@@ -53,7 +55,8 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
     beforeItem(""),
     afterItem(""),
     isCheckable(checkable),
-    isChecked(checked)
+    isChecked(checked),
+    isSeparator(separator)
 {
 }
 
diff --git a/libraries/script-engine/src/MenuItemProperties.h b/libraries/script-engine/src/MenuItemProperties.h
index 889fb3855a..e58ebe2afb 100644
--- a/libraries/script-engine/src/MenuItemProperties.h
+++ b/libraries/script-engine/src/MenuItemProperties.h
@@ -22,9 +22,9 @@ class MenuItemProperties {
 public:
     MenuItemProperties(); 
     MenuItemProperties(const QString& menuName, const QString& menuItemName, 
-                        const QString& shortcutKey = QString(""), bool checkable = false, bool checked = false);
+                       const QString& shortcutKey = QString(""), bool checkable = false, bool checked = false, bool separator = false);
     MenuItemProperties(const QString& menuName, const QString& menuItemName, 
-                        const KeyEvent& shortcutKeyEvent, bool checkable = false, bool checked = false);
+                       const KeyEvent& shortcutKeyEvent, bool checkable = false, bool checked = false, bool separator = false);
 
     QString menuName;
     QString menuItemName;