miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XSDL: do not restart in a loop, if we fail then stop

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-02-20 20:28:21 +02:00
parent 639a2e7e69
commit 4d6a8dcd88
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/jni/application/xserver/gfx.c
View File

@@ -826,9 +826,8 @@ void XSDL_generateBackground(const char * port, int showHelp, int resolutionW, i
void XSDL_showServerLaunchErrorMessage()
{
showErrorMessage( "Error: X server failed to launch.\n\n"
"This may happen because of SELinux,\n"
"or because installation was corrupted.\n"
"Either way, this app will not work, which is sad.");
"Try to use different display number,\n"
"or reboot your device.");
}
void showErrorMessage(const char *msg)

19
project/jni/application/xserver/main.c
View File

@@ -161,7 +161,7 @@ int main( int argc, char* argv[] )
__android_log_print(ANDROID_LOG_INFO, "XSDL", "> %s", args[i]);
// We should never quit. If that happens, then the server did not start - try with different port number.
atexit( &retryLaunchWithDifferentPort );
atexit( &showError );
__android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL chdir to: %s", getenv("SECURE_STORAGE_DIR"));
chdir( getenv("SECURE_STORAGE_DIR") ); // Megahack: change /proc/self/cwd to the X.org data dir, and use /proc/self/cwd path in libX11
@@ -196,18 +196,9 @@ void setupEnv(void)
sprintf( buf, "%s/usr/share/X11/locale", getenv("SECURE_STORAGE_DIR") );
}
void retryLaunchWithDifferentPort(void)
void showError(void)
{
int portNum = atoi(port + 1);
if (portNum > 10)
{
// Server was ultimately unable to start - show error and exit
XSDL_initSDL();
XSDL_showServerLaunchErrorMessage();
XSDL_deinitSDL();
return;
}
sprintf(port, ":%d", portNum + 1);
__android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL launch failed, retrying with new display number %s", port);
SDL_ANDROID_RestartMyself(port);
XSDL_initSDL();
XSDL_showServerLaunchErrorMessage();
XSDL_deinitSDL();
}