From 59effb32dd66065d1b0885edd7126b2971f30c98 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Tue, 9 Oct 2018 17:44:14 -0400 Subject: [PATCH] refactor --- GUI/main.cpp | 2 -- GUI/mainwindow.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/GUI/main.cpp b/GUI/main.cpp index 5af6850..fb2264a 100644 --- a/GUI/main.cpp +++ b/GUI/main.cpp @@ -19,7 +19,6 @@ LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS* exception) // See https://blogs.msdn.microsoft.com/oldnewthing/20100730-00/?p=13273 if (exception->ExceptionRecord->ExceptionCode == 0xE06D7363 && exception->ExceptionRecord->ExceptionInformation[2]) errorMsg << "Additional info: " << ((char****)exception->ExceptionRecord->ExceptionInformation[2])[3][1][1] + 8 << std::endl; - else #endif for (int i = 0; i < exception->ExceptionRecord->NumberParameters; ++i) errorMsg << L"Additional info: " << exception->ExceptionRecord->ExceptionInformation[i] << std::endl; @@ -35,6 +34,5 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; w.show(); - return a.exec(); } diff --git a/GUI/mainwindow.cpp b/GUI/mainwindow.cpp index 982f939..6683e5b 100644 --- a/GUI/mainwindow.cpp +++ b/GUI/mainwindow.cpp @@ -15,7 +15,7 @@ MainWindow::MainWindow(QWidget *parent) : // TODO: add GUI for changing these if (settings.contains("Flush_Delay")) TextThread::flushDelay = settings.value("Flush_Delay").toInt(); if (settings.contains("Max_Buffer_Size")) TextThread::maxBufferSize = settings.value("Max_Buffer_Size").toInt(); - if (settings.contains("Filter")) TextThread::filter = settings.value("Filter").toString().toStdWString().c_str(); + if (settings.contains("Filter")) TextThread::filter = settings.value("Filter").toString().toStdWString(); processCombo = findChild("processCombo"); ttCombo = findChild("ttCombo");