From 394cae37eb0c8d05cd7d866d23b4a48d2c6a1074 Mon Sep 17 00:00:00 2001 From: Nukem Date: Sat, 17 Oct 2015 22:38:49 -0400 Subject: [PATCH] EXE: Fix #385 --- src/exe/crashdump.cpp | 3 ++- src/gui/Src/Gui/StatusLabel.cpp | 3 +-- src/gui/Src/Gui/TabWidget.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/exe/crashdump.cpp b/src/exe/crashdump.cpp index d45995d4..b128b059 100644 --- a/src/exe/crashdump.cpp +++ b/src/exe/crashdump.cpp @@ -92,7 +92,8 @@ void CrashDumpCreate(EXCEPTION_POINTERS* ExceptionPointers) LONG CALLBACK CrashDumpVectoredHandler(EXCEPTION_POINTERS* ExceptionInfo) { - if(ExceptionInfo) + // Any "exception" under 0x1000 is usually just a failed RPC call + if (ExceptionInfo && ExceptionInfo->ExceptionRecord->ExceptionCode > 0x00001000) { // Skip DBG_PRINTEXCEPTION_C and DBG_PRINTEXCEPTION_WIDE_C switch(ExceptionInfo->ExceptionRecord->ExceptionCode) diff --git a/src/gui/Src/Gui/StatusLabel.cpp b/src/gui/Src/Gui/StatusLabel.cpp index 405bd88c..c411c039 100644 --- a/src/gui/Src/Gui/StatusLabel.cpp +++ b/src/gui/Src/Gui/StatusLabel.cpp @@ -42,9 +42,8 @@ void StatusLabel::debugStateChangedSlot(DBGSTATE state) this->setStyleSheet("QLabel { background-color : #c0c0c0; }"); GuiUpdateWindowTitle(""); break; - default: - break; } + this->repaint(); } diff --git a/src/gui/Src/Gui/TabWidget.cpp b/src/gui/Src/Gui/TabWidget.cpp index 0c701fea..1de48fed 100644 --- a/src/gui/Src/Gui/TabWidget.cpp +++ b/src/gui/Src/Gui/TabWidget.cpp @@ -18,11 +18,6 @@ MHTabWidget::MHTabWidget(QWidget* parent, bool allowDetach, bool allowDelete) : m_Windows.clear(); } -QTabBar* MHTabWidget::tabBar() -{ - return m_tabBar; -} - ////////////////////////////////////////////////////////////// // Default Destructor ////////////////////////////////////////////////////////////// @@ -34,6 +29,11 @@ MHTabWidget::~MHTabWidget(void) delete m_tabBar; } +QTabBar* MHTabWidget::tabBar() +{ + return m_tabBar; +} + int MHTabWidget::count() const { return QTabWidget::count() + m_Windows.size();