aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-19 08:27:49 (GMT)
committerrathnor <rathnor>2003-05-19 08:27:49 (GMT)
commitc62dc1e2afbf28d59b472ef720f338edb2ef463b (patch)
tree24e1c78f0f5ddc379a4fce83a15da826610df691
parent80161fc208431b0c2ed4265b788af0713401f133 (diff)
downloadfluxbox_pavel-c62dc1e2afbf28d59b472ef720f338edb2ef463b.zip
fluxbox_pavel-c62dc1e2afbf28d59b472ef720f338edb2ef463b.tar.bz2
fix initialise of s_display in a constructor for FbWindow (fixes bsetroot
segfault)
-rw-r--r--ChangeLog3
-rw-r--r--src/FbTk/FbWindow.cc5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 590d6b4..6efe266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.3: 2Changes for 0.9.3:
3*03/05/19:
4 * Fix bsetroot segfault (Simon)
5 FbWindow.cc
3*03/05/18: 6*03/05/18:
4 * Moved Resource.hh/cc, DirHelper.hh/cc and 7 * Moved Resource.hh/cc, DirHelper.hh/cc and
5 XrmDatabaseHelper.hh to FbTk (Henrik) 8 XrmDatabaseHelper.hh to FbTk (Henrik)
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
123void FbWindow::setNew(Window win) { 123void 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;