From 0d0d54ea665cf335f7e2117f25909f768c7509e3 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Wed, 17 Jun 2009 20:44:00 +0000
Subject: [PATCH] *Fixed GameSettings not being saved right *Moved the WC24
 Shutdown to networkop.cpp

---
 source/menu.cpp                               | 17 ++------------
 .../network/{updater.cpp => networkops.cpp}   | 22 +++++++++++++++++++
 source/network/{updater.h => networkops.h}    |  5 +++--
 source/prompts/PromptWindows.cpp              |  2 +-
 source/settings/cfg.c                         |  2 +-
 5 files changed, 29 insertions(+), 19 deletions(-)
 rename source/network/{updater.cpp => networkops.cpp} (88%)
 rename source/network/{updater.h => networkops.h} (81%)

diff --git a/source/menu.cpp b/source/menu.cpp
index 518c644d..4f3a641e 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -11,7 +11,6 @@
 #include <string.h>
 #include <stdio.h> //CLOCK
 #include <time.h>
-#include <ogc/machine/processor.h>
 
 #include "libwiigui/gui.h"
 #include "libwiigui/gui_gamegrid.h"
@@ -27,7 +26,7 @@
 #include "prompts/gameinfo.h"
 #include "mload/mload.h"
 #include "patches/patchcode.h"
-#include "network/updater.h"
+#include "network/networkops.h"
 #include "menu.h"
 #include "audio.h"
 #include "input.h"
@@ -1871,19 +1870,7 @@ int MainMenu(int menu)
                 break;
     }
 
-	bool onlinefix = IsNetworkInit();
-	if(onlinefix && IOS_GetVersion() == ios2) {
-		s32 kd_fd, ret;
-		STACK_ALIGN(u8, kd_buf, 0x20, 32);
-
-		kd_fd = IOS_Open("/dev/net/kd/request", 0);
-		if (kd_fd >= 0) {
-			ret = IOS_Ioctl(kd_fd, 7, NULL, 0, kd_buf, 0x20);
-			if(ret >= 0)
-				onlinefix = false; // fixed no IOS reload needed
-			IOS_Close(kd_fd);
-		}
-	}
+	bool onlinefix = ShutdownWC24();
 	if(IOS_GetVersion() != ios2 || onlinefix == true) {
 		ret = Sys_IosReload(ios2);
 		if(ret < 0) {
diff --git a/source/network/updater.cpp b/source/network/networkops.cpp
similarity index 88%
rename from source/network/updater.cpp
rename to source/network/networkops.cpp
index 81b7c66b..4a484bed 100644
--- a/source/network/updater.cpp
+++ b/source/network/networkops.cpp
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ogcsys.h>
+#include <ogc/machine/processor.h>
 
 #include "prompts/PromptWindows.h"
 #include "settings/cfg.h"
@@ -58,6 +59,27 @@ char * GetNetworkIP(void)
     return IP;
 }
 
+/****************************************************************************
+ * Get network IP
+ ***************************************************************************/
+bool ShutdownWC24()
+{
+    bool onlinefix = IsNetworkInit();
+	if(onlinefix) {
+		s32 kd_fd, ret;
+		STACK_ALIGN(u8, kd_buf, 0x20, 32);
+
+		kd_fd = IOS_Open("/dev/net/kd/request", 0);
+		if (kd_fd >= 0) {
+			ret = IOS_Ioctl(kd_fd, 7, NULL, 0, kd_buf, 0x20);
+			if(ret >= 0)
+				onlinefix = false; // fixed no IOS reload needed
+			IOS_Close(kd_fd);
+		}
+	}
+	return onlinefix;
+}
+
 s32 network_request(const char * request)
 {
 	char buf[1024];
diff --git a/source/network/updater.h b/source/network/networkops.h
similarity index 81%
rename from source/network/updater.h
rename to source/network/networkops.h
index 589afa09..0dddc28b 100644
--- a/source/network/updater.h
+++ b/source/network/networkops.h
@@ -1,9 +1,10 @@
-#ifndef _UPDATER_H_
-#define _UPDATER_H_
+#ifndef _NETWORKOPS_H_
+#define _NETWORKOPS_H_
 
 void Initialize_Network(void);
 bool IsNetworkInit(void);
 char * GetNetworkIP(void);
+bool ShutdownWC24();
 s32 network_request(const char * request);
 s32 network_read(u8 *buf, u32 len);
 s32 download_request(const char * url);
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 28b6ed17..e9a08ff0 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -13,7 +13,7 @@
 #include "language/language.h"
 #include "libwiigui/gui.h"
 #include "libwiigui/gui_diskcover.h"
-#include "network/updater.h"
+#include "network/networkops.h"
 #include "network/http.h"
 #include "mload/mload.h"
 #include "fatmounter.h"
diff --git a/source/settings/cfg.c b/source/settings/cfg.c
index 3e04ba40..64faacb8 100644
--- a/source/settings/cfg.c
+++ b/source/settings/cfg.c
@@ -1439,7 +1439,7 @@ bool cfg_save_games()
 		fprintf(f, "pctrl:%d; ", cfg_game[i].parentalcontrol);
 		fprintf(f, "errorfix002:%d; ", cfg_game[i].errorfix002);
 		fprintf(f, "patchcountrystrings:%d; ", cfg_game[i].patchcountrystrings);
-		fprintf(f, "loadalternatedol:%d; ", cfg_game[i].loadalternatedol);
+		fprintf(f, "loadalternatedol:%d;\n", cfg_game[i].loadalternatedol);
 	}
 	fprintf(f, "# END\n");
 	fclose(f);