From 257f17f8df7985cf282c63bf5ab024eefb8719d3 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 10 Oct 2017 20:18:04 +0300 Subject: [PATCH] Qt4: Don't segfault with QT_COMPACT --- sys/unix/hints/linux-qt4 | 2 +- win/Qt4/qt4main.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/unix/hints/linux-qt4 b/sys/unix/hints/linux-qt4 index 51f6ad05b..ae3911939 100644 --- a/sys/unix/hints/linux-qt4 +++ b/sys/unix/hints/linux-qt4 @@ -20,7 +20,7 @@ VARDIR = $(HACKDIR) POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf; POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir); -CFLAGS=-O -I../include -DNOTPARMDECL +CFLAGS=-g -O -I../include -DNOTPARMDECL CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" diff --git a/win/Qt4/qt4main.cpp b/win/Qt4/qt4main.cpp index ec7e58324..f9a74e506 100644 --- a/win/Qt4/qt4main.cpp +++ b/win/Qt4/qt4main.cpp @@ -861,14 +861,17 @@ void NetHackQtMainWindow::doKeys(const QString& k) void NetHackQtMainWindow::AddMessageWindow(NetHackQtMessageWindow* window) { message=window; - hsplitter->insertWidget(0, message->Widget()); + if (!qt_compact_mode) + hsplitter->insertWidget(0, message->Widget()); ShowIfReady(); } void NetHackQtMainWindow::AddMapWindow(NetHackQtMapWindow2* window) { + map=window; - vsplitter->insertWidget(1, map->Widget()); + if (!qt_compact_mode) + vsplitter->insertWidget(1, map->Widget()); ShowIfReady(); connect(map,SIGNAL(resized()),this,SLOT(layout())); } @@ -876,7 +879,8 @@ void NetHackQtMainWindow::AddMapWindow(NetHackQtMapWindow2* window) void NetHackQtMainWindow::AddStatusWindow(NetHackQtStatusWindow* window) { status=window; - hsplitter->insertWidget(2, status->Widget()); + if (!qt_compact_mode) + hsplitter->insertWidget(2, status->Widget()); ShowIfReady(); } -- 2.50.1