1 files changed, 7 insertions, 0 deletions
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index 6355f139..77f371d8 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -67,40 +67,41 @@ namespace VeraCrypt
 
 			remove (fifoPath.c_str());
 			throw_sys_if (mkfifo (fifoPath.c_str(), S_IRUSR | S_IWUSR) == -1);
 
 			ShowRequestFifo = open (fifoPath.c_str(), O_RDONLY | O_NONBLOCK);
 			throw_sys_if (ShowRequestFifo == -1);
 		}
 		catch (...)
 		{
 #ifdef DEBUG
 			throw;
 #endif
 		}
 #endif
 
 		InitControls();
 		InitPreferences();
 		InitTaskBarIcon();
 		InitEvents();
 		InitMessageFilter();
+		InitWindowPrivacy();
 
 		if (!GetPreferences().SecurityTokenModule.IsEmpty() && !SecurityToken::IsInitialized())
 		{
 			try
 			{
 				Gui->InitSecurityTokenLibrary();
 			}
 			catch (exception &e)
 			{
 				Gui->ShowError (e);
 			}
 		}
 
 		Connect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrame::OnQuit ) );
 		Connect( wxID_ANY, wxEVT_COMMAND_UPDATE_VOLUME_LIST, wxCommandEventHandler( MainFrame::OnUpdateVolumeList ) );
 		Connect( wxID_ANY, wxEVT_COMMAND_PREF_UPDATED, wxCommandEventHandler( MainFrame::OnPreferencesUpdated ) );
 		Connect( wxID_ANY, wxEVT_COMMAND_OPEN_VOLUME_REQUEST, wxCommandEventHandler( MainFrame::OnOpenVolumeSystemRequest ) );
 
 #ifdef TC_MACOSX
 		Connect( wxID_ANY, wxEVT_MOVE, wxMoveEventHandler( MainFrame::OnMoveHandler ) );
@@ -453,40 +454,46 @@ namespace VeraCrypt
 			}
 			else
 			{
 				frame->OnDeviceChange ();
 			}
 		}
 
 		return CallWindowProc (MainFrameWndProc, hwnd, message, wParam, lParam);
 	}
 #endif
 
 	void MainFrame::InitMessageFilter ()
 	{
 #ifdef TC_WINDOWS
 		HWND mainFrameHwnd = static_cast <HWND> (GetHandle());
 		MainFrameWndProc = (WNDPROC) GetWindowLongPtr (mainFrameHwnd, GWL_WNDPROC);
 		SetWindowLongPtr (mainFrameHwnd, GWL_WNDPROC, (LONG_PTR) MainFrameWndProcFilter);
 #endif
 	}
 
+
+	void MainFrame::InitWindowPrivacy ()
+	{
+		Gui->SetContentProtection(!CmdLine->ArgAllowScreencapture);
+	}
+
 	void MainFrame::InitPreferences ()
 	{
 		try
 		{
 			LoadPreferences();
 
 			VolumeSlotNumber lastSelectedSlotNumber = GetPreferences().LastSelectedSlotNumber;
 			if (Core->IsSlotNumberValid (lastSelectedSlotNumber))
 			{
 				long slotIndex = SlotNumberToItemIndex (lastSelectedSlotNumber);
 				if (slotIndex >= 0)
 				{
 					SlotListCtrl->SetItemState (slotIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 					SlotListCtrl->EnsureVisible (slotIndex);
 				}
 			}
 
 			LoadFavoriteVolumes();
 			VolumeHistory::Load();