From 4d8a23c1fcedf03773137e5e83ecd6f10ccbbf91 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 21 Sep 2015 20:24:39 +0200 Subject: [PATCH] pcsx2:gui: init all members in constructor --- pcsx2/gui/App.h | 10 ++++++---- pcsx2/gui/AppInit.cpp | 3 +++ pcsx2/gui/AppMain.cpp | 1 + pcsx2/gui/ConsoleLogger.h | 2 +- pcsx2/gui/Debugger/CtrlRegisterList.cpp | 5 +++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h index 5c6eb39cf2..01498a4f3f 100644 --- a/pcsx2/gui/App.h +++ b/pcsx2/gui/App.h @@ -219,10 +219,12 @@ struct AppImageIds ToolbarIds() { - Settings = Play = - PluginVideo = - PluginAudio = - PluginPad = -1; + Settings = -1; + Play = -1; + Resume = -1; + PluginVideo = -1; + PluginAudio = -1; + PluginPad = -1; } } Toolbars; }; diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 1a70e57980..fb2412342e 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -697,10 +697,13 @@ Pcsx2App::Pcsx2App() m_PendingSaves = 0; m_ScheduledTermination = false; + m_UseGUI = true; + m_NoGuiExitPrompt = true; m_id_MainFrame = wxID_ANY; m_id_GsFrame = wxID_ANY; m_id_ProgramLogBox = wxID_ANY; + m_id_Disassembler = wxID_ANY; m_ptr_ProgramLog = NULL; SetAppName( L"PCSX2" ); diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 614bb728a4..478fdf231c 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -1090,6 +1090,7 @@ public: SysExecEvent_Execute() : m_UseCDVDsrc(false) , m_UseELFOverride(false) + , m_cdvdsrc_type(CDVDsrc_Iso) { } diff --git a/pcsx2/gui/ConsoleLogger.h b/pcsx2/gui/ConsoleLogger.h index 3f18649bcb..49e2d971e7 100644 --- a/pcsx2/gui/ConsoleLogger.h +++ b/pcsx2/gui/ConsoleLogger.h @@ -165,7 +165,7 @@ protected: ConsoleColors color; int startpoint; - ColorSection() {} + ColorSection() : color(Color_Default), startpoint(0) {} ColorSection( ConsoleColors _color, int msgptr ) : color(_color), startpoint(msgptr) { } }; diff --git a/pcsx2/gui/Debugger/CtrlRegisterList.cpp b/pcsx2/gui/Debugger/CtrlRegisterList.cpp index 86b237caa8..a99f504933 100644 --- a/pcsx2/gui/Debugger/CtrlRegisterList.cpp +++ b/pcsx2/gui/Debugger/CtrlRegisterList.cpp @@ -45,8 +45,9 @@ CtrlRegisterList::CtrlRegisterList(wxWindow* parent, DebugInterface* _cpu) { rowHeight = g_Conf->EmuOptions.Debugger.FontHeight+2; charWidth = g_Conf->EmuOptions.Debugger.FontWidth; - category = 0; - maxBits = 128; + category = 0; + maxBits = 128; + lastPc = 0xFFFFFFFF; for (int i = 0; i < cpu->getRegisterCategoryCount(); i++) {