From 434971987fcd92c3e0377d24e17d756a60364722 Mon Sep 17 00:00:00 2001
From: "fabio.olimpieri" <fabio.olimpieri@tin.it>
Date: Thu, 27 Dec 2012 10:47:42 +0000
Subject: [PATCH] v2.4.1: Fixed Restore key

---
 CHANGES.c64-network.org      | 7 +++++++
 Src/gui/menu_messages.c      | 6 +++---
 Src/gui/virtual_keyboard.cpp | 4 ++++
 Src/main.cpp                 | 2 +-
 meta.xml                     | 8 ++++----
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGES.c64-network.org b/CHANGES.c64-network.org
index 8c43d63..21bbd9e 100644
--- a/CHANGES.c64-network.org
+++ b/CHANGES.c64-network.org
@@ -1,3 +1,10 @@
+c64-network.org, v2.4.1: 
+		* Fixed Restore key
+		* (build) Compiled against libogc 1.8.11 and SDL-Wii r101
+		* Fixed full resolution in 576i video mode
+
+-- Oibaf, fabio.olimpieri@tin.it, Dec 27 CEST 2012
+
 
 c64-network.org, v2.4: 
 		* Added SMB support
diff --git a/Src/gui/menu_messages.c b/Src/gui/menu_messages.c
index 0864e62..0fbc3ed 100644
--- a/Src/gui/menu_messages.c
+++ b/Src/gui/menu_messages.c
@@ -258,11 +258,11 @@ const char *options_menu_messages[15] = {
 
 const char *bind_key_menu_messages[9] = {
                 /*00*/          "Wiimote",
-                /*01*/          "^|A|B|1|2|+|-",
+                /*01*/          "^| A| B| 1| 2| +| -",
                 /*02*/          "Nunchuk",
-                /*03*/          "^|Z|C",
+                /*03*/          "^| Z| C",
                 /*04*/          "Classic",
-                /*05*/          "^|a|b|x|y|L|R|Zl|Zr|+|-",
+                /*05*/          "^|a|b|x|y|L|R|Zl|Zr| +| -",
                 /*06*/          " ",
                 /*07*/          "Reset to defaults",
                 NULL
diff --git a/Src/gui/virtual_keyboard.cpp b/Src/gui/virtual_keyboard.cpp
index e7c675b..d8f4eb5 100644
--- a/Src/gui/virtual_keyboard.cpp
+++ b/Src/gui/virtual_keyboard.cpp
@@ -15,6 +15,7 @@
 
 #include "virtual_keyboard.hh"
 #include "gui.hh"
+#include "C64.h"
 
 typedef struct virtkey
 {
@@ -322,6 +323,9 @@ void VirtualKeyboard::runLogic()
 	else if (ev & KEY_SELECT)
 	{
 		virtkey_t *key = &keys[ this->sel_y * KEY_COLS + this->sel_x ];
+		
+		//Special case for Restore
+		if (strcmp(key->name,"Rstr")==0) {TheC64->NMI();return;} 
 
 		if (!key)
 			return;
diff --git a/Src/main.cpp b/Src/main.cpp
index d992a49..e44cfea 100644
--- a/Src/main.cpp
+++ b/Src/main.cpp
@@ -218,7 +218,7 @@ extern "C" int main(int argc, char **argv)
 	
 	networkisinit = InitNetwork();	
 		
-	sleep(4);
+	sleep(3);
 	
 	//create tmp directory if it does not exist
 	dir_tmp = opendir("/frodo/tmp");	
diff --git a/meta.xml b/meta.xml
index fcc5b9f..d1ebfbc 100644
--- a/meta.xml
+++ b/meta.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-  <app version="2">
+  <app version="1">
     <name>C64-network.org (Frodo)</name>
-    <coder>Simon Kagstrom</coder>
-    <version>2.4</version>
-    <release_date>20110808</release_date>
+    <coder>Simon Kagstrom, Oibaf</coder>
+    <version>2.4.1</version>
+    <release_date>20121227</release_date>
     <short_description>Commodore 64 emulator</short_description>
     <long_description>C64-network.org is a networked C64 emulator based on Frodo written by Christian Bauer. It supports C64 disk and tape images in the .d64, .t64 and .prg formats. The port to Wii was done by Simon Kagstrom.