don't wait for network init before entering game

This commit is contained in:
dborth 2009-06-22 20:04:19 +00:00
parent b657722e34
commit 99632b84f1
4 changed files with 9 additions and 3 deletions

View File

@ -74,6 +74,11 @@ HaltDeviceThread()
{ {
deviceHalt = true; deviceHalt = true;
#ifdef HW_RVL
if(inNetworkInit) // don't wait for network to initialize
return;
#endif
// wait for thread to finish // wait for thread to finish
while(!LWP_ThreadIsSuspended(devicethread)) while(!LWP_ThreadIsSuspended(devicethread))
usleep(100); usleep(100);
@ -119,8 +124,8 @@ devicecallback (void *arg)
} }
} }
InitializeNetwork(SILENT);
UpdateCheck(); UpdateCheck();
InitializeNetwork(SILENT);
#else #else
if(isMounted[METHOD_SD_SLOTA]) if(isMounted[METHOD_SD_SLOTA])
{ {

View File

@ -24,7 +24,7 @@
#include "http.h" #include "http.h"
#include "filebrowser.h" #include "filebrowser.h"
static bool inNetworkInit = false; bool inNetworkInit = false;
static bool networkInit = false; static bool networkInit = false;
static bool autoNetworkInit = true; static bool autoNetworkInit = true;
static bool networkShareInit = false; static bool networkShareInit = false;

View File

@ -19,5 +19,6 @@ bool ConnectShare (bool silent);
void CloseShare(); void CloseShare();
extern bool updateFound; extern bool updateFound;
extern bool inNetworkInit;
#endif #endif

View File

@ -25,7 +25,7 @@ extern int rumbleRequest[4];
extern u32 btnmap[2][4][12]; extern u32 btnmap[2][4][12];
void SetControllers(); void SetControllers();
void ResetControls(int wc = 0, int cc = 0); void ResetControls(int cc = 0, int wc = 0);
void ShutoffRumble(); void ShutoffRumble();
void DoRumble(int i); void DoRumble(int i);
s8 WPAD_StickX(u8 chan,u8 right); s8 WPAD_StickX(u8 chan,u8 right);