Quit back to the homebrew channel by default, but not if networking has been

enabled
This commit is contained in:
simon.kagstrom 2009-04-26 06:02:57 +00:00
parent b90e393ac6
commit 66cf5202e5
4 changed files with 9 additions and 1 deletions

View File

@ -10,6 +10,9 @@
TODO: Handle Run/Stop in virtual keyboard (?)
version 10:
* Quit to the homebrew menu unless networking has been enabled ("hard"
quit fixes a networking issue)
* Added ability to recurse into directories (partly by Holger Eilts)
* Large redesign of menu layout and colors (Holger Eilts)

View File

@ -729,7 +729,7 @@ void C64::VBlank(bool draw_frame)
this->network_vblank();
#if defined(GEKKO)
if (this->quit_thyself)
if (this->quit_thyself && Network::networking_started == true)
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
now = ticks_to_millisecs(gettime());
#else

View File

@ -78,6 +78,7 @@ Network::Network(const char *remote_host, int port, bool is_master)
/* Assume black screen */
memset(this->screen, 0, DISPLAY_X * DISPLAY_Y);
Network::networking_started = true;
/* Peer addresses, if it fails we are out of luck */
if (this->InitSocket(remote_host, port) == false)
{
@ -1256,6 +1257,7 @@ uint8 Network::sample_buf[NETWORK_SOUND_BUF_SIZE];
int Network::sample_head;
int Network::sample_tail;
bool Network::is_master = true; /* Assume until set false */
bool Network::networking_started = false;
#if defined(GEKKO)
#include "NetworkWii.h"

View File

@ -364,6 +364,9 @@ protected:
static uint8 sample_buf[NETWORK_SOUND_BUF_SIZE];
static int sample_head;
static int sample_tail;
public:
static bool networking_started;
};
#endif /* NETWORK_H */