Prevent crash dialog from popping up when the game restarts

Fixes #6887
This commit is contained in:
Oliver Brakmann
2014-11-04 21:29:16 +01:00
parent e6bf1cafd3
commit 64506b856a
5 changed files with 7 additions and 7 deletions

View File

@@ -358,7 +358,7 @@ install-linux-scripts:
@echo "#!/bin/sh" > openra
@echo 'cd "$(gameinstalldir)"' >> openra
@echo 'mono OpenRA.Game.exe "$$@"' >> openra
@echo 'if [ $$? != 0 ]' >> openra
@echo 'if [ $$? != 0 && $$? != 1 ]' >> openra
@echo 'then' >> openra
@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra

View File

@@ -16,7 +16,7 @@ using System.Text;
namespace OpenRA
{
enum RunStatus
public enum RunStatus
{
Error = -1,
Success = 0,

View File

@@ -105,7 +105,7 @@ namespace OpenRA
static void GameProcessExited(object sender, EventArgs e)
{
if (gameProcess.ExitCode != 0)
if (!(gameProcess.ExitCode == (int)RunStatus.Success || gameProcess.ExitCode == (int)RunStatus.Restart))
ShowErrorDialog();
Exit();

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# launch script (executed by Desura)
mono OpenRA.Game.exe Server.Dedicated=False Server.DedicatedLoop=False "$@"
if [ $? != 0 ]
if [ $? != 0 && $? != 1 ]
then
ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."
$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ

View File

@@ -42,7 +42,7 @@ fi
cd "$RESOURCES" && FONTCONFIG_PATH="." $MONO_BIN --debug OpenRA.Game.exe Graphics.Renderer=Sdl2
# Display an error dialog on game crash
if [ $? != 0 ]
if [ $? != 0 && $? != 1 ]
then
osascript \
-e "set logsPath to ((path to application support folder from user domain) as text) & \"OpenRA:Logs:\"" \