mirror of
https://github.com/gryf/wmaker.git
synced 2026-03-27 07:23:31 +01:00
Fixed a couple of crashing bugs generated by dereferencing of 0x0
pointers (added by the new modal loop code)
This commit is contained in:
@@ -11,7 +11,7 @@ alertPanelOnClick(WMWidget *self, void *clientData)
|
||||
{
|
||||
WMAlertPanel *panel = clientData;
|
||||
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->othBtn));
|
||||
WMBreakModalLoop(WMWidgetScreen(self));
|
||||
if (self == panel->defBtn) {
|
||||
panel->result = WAPRDefault;
|
||||
} else if (self == panel->othBtn) {
|
||||
@@ -35,7 +35,7 @@ handleKeyPress(XEvent *event, void *clientData)
|
||||
WMPerformButtonClick(panel->othBtn ? panel->othBtn : panel->altBtn);
|
||||
} else {
|
||||
panel->result = WAPRDefault;
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->othBtn));
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->win));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -291,7 +291,7 @@ handleKeyPress2(XEvent *event, void *clientData)
|
||||
WMPerformButtonClick(panel->altBtn);
|
||||
} else {
|
||||
/* printf("got esc\n");*/
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->altBtn));
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->win));
|
||||
panel->result = WAPRDefault;
|
||||
}
|
||||
}
|
||||
@@ -370,7 +370,7 @@ endedEditingObserver(void *observerData, WMNotification *notification)
|
||||
if (panel->altBtn)
|
||||
WMPerformButtonClick(panel->altBtn);
|
||||
else {
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->defBtn));
|
||||
WMBreakModalLoop(WMWidgetScreen(panel->win));
|
||||
panel->result = WAPRDefault;
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user