Fix context menu items when navigation option is set to False (cztomczak#222)

cztomczak · cztomczak · commit d4217b23c932 · 2017-02-04T19:13:18.000+01:00
diff --git a/src/client_handler/context_menu_handler.cpp b/src/client_handler/context_menu_handler.cpp
@@ -35,11 +35,14 @@ void ContextMenuHandler::OnBeforeContextMenu(
         model->Clear();
         return;
     }
-    if (!navigation) {
+    if (!navigation && model->IsVisible(MENU_ID_BACK)
+                    && model->IsVisible(MENU_ID_FORWARD)) {
         model->Remove(MENU_ID_BACK);
         model->Remove(MENU_ID_FORWARD);
         // Remove separator
-        model->RemoveAt(0);
+        if (model->GetTypeAt(0) == MENUITEMTYPE_SEPARATOR) {
+            model->RemoveAt(0);
+        }
     }
     if (!print) {
         model->Remove(MENU_ID_PRINT);
