diff options
author | rathnor <rathnor> | 2003-05-19 08:27:49 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-05-19 08:27:49 (GMT) |
commit | c62dc1e2afbf28d59b472ef720f338edb2ef463b (patch) | |
tree | 24e1c78f0f5ddc379a4fce83a15da826610df691 /src/FbTk/FbWindow.cc | |
parent | 80161fc208431b0c2ed4265b788af0713401f133 (diff) | |
download | fluxbox-c62dc1e2afbf28d59b472ef720f338edb2ef463b.zip fluxbox-c62dc1e2afbf28d59b472ef720f338edb2ef463b.tar.bz2 |
fix initialise of s_display in a constructor for FbWindow (fixes bsetroot
segfault)
Diffstat (limited to 'src/FbTk/FbWindow.cc')
-rw-r--r-- | src/FbTk/FbWindow.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 5634a5d..ed97ecc 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbWindow.cc,v 1.18 2003/05/17 10:43:20 fluxgen Exp $ | 22 | // $Id: FbWindow.cc,v 1.19 2003/05/19 08:27:49 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWindow.hh" | 24 | #include "FbWindow.hh" |
25 | #include "EventManager.hh" | 25 | #include "EventManager.hh" |
@@ -121,6 +121,9 @@ FbWindow &FbWindow::operator = (Window win) { | |||
121 | } | 121 | } |
122 | 122 | ||
123 | void FbWindow::setNew(Window win) { | 123 | void FbWindow::setNew(Window win) { |
124 | if (s_display == 0) | ||
125 | s_display = App::instance()->display(); | ||
126 | |||
124 | if (m_window != 0 && m_destroy) | 127 | if (m_window != 0 && m_destroy) |
125 | XDestroyWindow(s_display, m_window); | 128 | XDestroyWindow(s_display, m_window); |
126 | m_window = win; | 129 | m_window = win; |