diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index e6f8293ea4..a932d7ec8a 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -230,11 +230,9 @@ void SysCoreThread::GameStartingInThread() { GetMTGS().SendGameCRC(ElfCRC); -#ifdef PCSX2_DEVBUILD MIPSAnalyst::ScanForFunctions(ElfTextRange.first,ElfTextRange.first+ElfTextRange.second,true); symbolMap.UpdateActiveSymbols(); sApp.PostAppMethod(&Pcsx2App::resetDebugger); -#endif if (EmuConfig.EnablePatches) ApplyPatch(0); if (EmuConfig.EnableCheats) ApplyCheat(0); diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index f32a4af20a..188e7a18c4 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -339,9 +339,8 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) m_menubar.Append( &m_menuCDVD, _("CD&VD") ); m_menubar.Append( &m_menuConfig, _("&Config") ); m_menubar.Append( &m_menuMisc, _("&Misc") ); -#ifdef PCSX2_DEVBUILD m_menubar.Append( &m_menuDebug, _("&Debug") ); -#endif + SetMenuBar( &m_menubar ); // ------------------------------------------------------------------------ @@ -507,11 +506,10 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) m_menuMisc.AppendSeparator(); m_menuMisc.Append( MenuId_ChangeLang, L"Change Language" ); // Always in English -#ifdef PCSX2_DEVBUILD m_menuDebug.Append(MenuId_Debug_Open, _("Open Debug Window..."), wxEmptyString); //m_menuDebug.Append(MenuId_Debug_MemoryDump, _("Memory Dump..."), wxEmptyString); m_menuDebug.Append(MenuId_Debug_Logging, _("Logging..."), wxEmptyString); -#endif + m_MenuItem_Console.Check( g_Conf->ProgLogBox.Visible ); ConnectMenus();