From f842c206f39657f3160a7ae01669d7e81fae3a5a Mon Sep 17 00:00:00 2001 From: O1L Date: Tue, 27 Oct 2015 01:41:12 +0400 Subject: [PATCH] Removed unneeded config saves and misprints --- rpcs3/Emu/System.cpp | 1 - rpcs3/Gui/FrameBase.h | 4 ++-- rpcs3/config.h | 2 +- rpcs3/rpcs3.cpp | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 5ee24d6782..1299703045 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -66,7 +66,6 @@ Emulator::Emulator() void Emulator::Init() { rpcs3::config.load(); - rpcs3::config.save(); rpcs3::oninit(); } diff --git a/rpcs3/Gui/FrameBase.h b/rpcs3/Gui/FrameBase.h index b4fac8fe16..edec47d5cb 100644 --- a/rpcs3/Gui/FrameBase.h +++ b/rpcs3/Gui/FrameBase.h @@ -38,7 +38,7 @@ protected: void LoadInfo() { - SetSize(wxSize(rpcs3::config.gui.size.width.value(), rpcs3::config.gui.size.hight.value())); + SetSize(wxSize(rpcs3::config.gui.size.width.value(), rpcs3::config.gui.size.height.value())); SetPosition(wxPoint(rpcs3::config.gui.position.x.value(), rpcs3::config.gui.position.y.value())); } @@ -52,7 +52,7 @@ protected: void OnResize(wxSizeEvent& event) { rpcs3::config.gui.size.width = GetSize().GetWidth(); - rpcs3::config.gui.size.hight = GetSize().GetHeight(); + rpcs3::config.gui.size.height = GetSize().GetHeight(); rpcs3::config.gui.position.x = GetPosition().x; rpcs3::config.gui.position.y = GetPosition().y; if(m_is_skip_resize) event.Skip(); diff --git a/rpcs3/config.h b/rpcs3/config.h index 9879d01fff..4d053c2f7b 100644 --- a/rpcs3/config.h +++ b/rpcs3/config.h @@ -577,7 +577,7 @@ namespace rpcs3 size_group(group *grp) : group{ grp, "size" } {} entry width{ this, "width", 900 }; - entry hight{ this, "hight", 600 }; + entry height{ this, "height", 600 }; } size{ this }; struct position_group : protected group diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 5354ea5920..a9e19eaf7c 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -200,7 +200,6 @@ void Rpcs3App::Exit() } Emu.Stop(); - rpcs3::config.save(); Ini.Save(); wxApp::Exit();