From 14093c86a973a50af8d2ef48965bcd7af0e82839 Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Fri, 24 Feb 2017 13:48:55 +0200
Subject: [PATCH] load config.yaml settings in a new  configpergame

---
 rpcs3/Gui/SettingsDialog.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp
index 8de6552490..122a8e9a3a 100644
--- a/rpcs3/Gui/SettingsDialog.cpp
+++ b/rpcs3/Gui/SettingsDialog.cpp
@@ -210,8 +210,15 @@ SettingsDialog::SettingsDialog(wxWindow* parent, const wxString& pergameload)
 
 	// Incrementally load config.yml
 	const fs::file config(!pergameload.IsEmpty() ? pergameload.ToStdString() : fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create);
-
-	loaded += YAML::Load(config.to_string());
+	if (config.to_string().length() == 0 && !pergameload.IsEmpty())//empty first time gameconfig
+	{
+		const fs::file configexisted(fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create);
+		loaded += YAML::Load(configexisted.to_string());
+	}
+	else
+	{
+		loaded += YAML::Load(config.to_string());
+	}
 
 	std::vector<std::unique_ptr<cfg_adapter>> pads;