diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index d6f82a84..df1b8f77 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/src/Main/Forms/MainFrame.cpp @@ -48,6 +48,11 @@ namespace VeraCrypt MainFrame::MainFrame (wxWindow* parent) : MainFrameBase (parent), #ifdef HAVE_INDICATORS indicator (NULL), + indicator_item_showhide (NULL), + indicator_item_mountfavorites (NULL), + indicator_item_dismountall (NULL), + indicator_item_prefs (NULL), + indicator_item_exit (NULL), #endif ListItemRightClickEventPending (false), SelectedItemIndex (-1), @@ -1445,7 +1450,7 @@ namespace VeraCrypt try { uint8 buf[128]; - if (read (ShowRequestFifo, buf, sizeof (buf)) > 0 && Gui->IsInBackgroundMode()) + if (read (ShowRequestFifo, buf, sizeof (buf)) > 0) Gui->SetBackgroundMode (false); } catch (...) diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index 84a40eaf..3dd294d5 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1037,7 +1037,6 @@ namespace VeraCrypt if (write (showFifo, buf, 1) == 1) { close (showFifo); - Gui->ShowInfo (LangString["LINUX_VC_RUNNING_ALREADY"]); Application::SetExitCode (0); return false; } @@ -1872,7 +1871,9 @@ namespace VeraCrypt BackgroundMode = state; #ifdef HAVE_INDICATORS - gtk_menu_item_set_label ((GtkMenuItem*) ((MainFrame*) mMainFrame)->indicator_item_showhide, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"].mb_str()); + MainFrame *mainFrame = (MainFrame*) mMainFrame; + if (mainFrame->indicator_item_showhide) + gtk_menu_item_set_label ((GtkMenuItem*) mainFrame->indicator_item_showhide, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"].mb_str()); #endif }