summaryrefslogtreecommitdiff
path: root/src/Fl_x.cxx
diff options
context:
space:
mode:
authorLauri Kasanen <cand@gmx.com>2014-09-05 13:14:16 +0000
committerLauri Kasanen <cand@gmx.com>2014-09-05 13:14:16 +0000
commit523c657f2ec9af4606ff55417d423c67eaa50275 (patch)
treeaf5ecd207f0d479fba61be74e90f7d028dfcee5f /src/Fl_x.cxx
parent7ebbe0baf453ba66324c830bf7156d2ccaec2f02 (diff)
Robustness fix for the first window
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10278 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
-rw-r--r--src/Fl_x.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 7869791d7..c3f2ea2a3 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2213,12 +2213,17 @@ void Fl_X::activate_window(Window w) {
if (!ewmh_supported())
return;
- Fl_X *x = Fl_X::i(fl_xfocus);
- if (!x)
- return;
+ Window prev = 0;
+
+ if (fl_xfocus) {
+ Fl_X *x = Fl_X::i(fl_xfocus);
+ if (!x)
+ return;
+ prev = x->xid;
+ }
send_wm_event(w, fl_NET_ACTIVE_WINDOW, 1 /* application */,
- 0 /* timestamp */, x->xid /* previously active window */);
+ 0 /* timestamp */, prev /* previously active window */);
}
/* Change an existing window to fullscreen */