1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00

- Fixed a bug that crashed wmaker when selecting the "Start alternate window

manager" option in the crashing dialog panel.
- Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
  it is defined) to overwrite the default hardcoded fallback window manager.
This commit is contained in:
dan
2002-02-01 01:20:15 +00:00
parent 06f1bf91a9
commit f37b4cf5d0
4 changed files with 26 additions and 9 deletions

View File

@@ -313,7 +313,7 @@ handleSig(int sig)
static int already_crashed = 0;
int dumpcore = 0;
#ifndef NO_EMERGENCY_AUTORESTART
int crashAction;
int crashAction, i;
char *argv[2];
argv[1] = NULL;
@@ -362,7 +362,6 @@ handleSig(int sig)
if (dpy) {
CARD32 data[2];
WWindow *wwin;
int i;
XGrabServer(dpy);
crashAction = wShowCrashingDialogPanel(sig);
@@ -411,9 +410,10 @@ handleSig(int sig)
wmessage(_("trying to start alternate window manager..."));
Restart(FALLBACK_WINDOWMANAGER, False);
Restart("fvwm", False);
Restart("twm", False);
for (i=0; i<WMGetArrayItemCount(wPreferences.fallbackWMs); i++) {
Restart(WMGetFromArray(wPreferences.fallbackWMs, i), False);
}
wfatal(_("failed to start alternate window manager. Aborting."));
#else
wfatal(_("a fatal error has occured, probably due to a bug. "