diff --git a/src/drivers/Qt/MsgLogViewer.cpp b/src/drivers/Qt/MsgLogViewer.cpp index a665d428..7c4c4db4 100644 --- a/src/drivers/Qt/MsgLogViewer.cpp +++ b/src/drivers/Qt/MsgLogViewer.cpp @@ -230,10 +230,14 @@ MsgLogViewDialog_t::MsgLogViewDialog_t(QWidget *parent) updateTimer->start(500); // 2hz + FCEU_WRAPPER_LOCK(); + msgLog.loadTextViewer(txtView); totalLines = msgLog.getTotalLineCount(); + FCEU_WRAPPER_UNLOCK(); + txtView->moveCursor(QTextCursor::End); restoreGeometry(settings.value("MsgLogWindow/geometry").toByteArray()); diff --git a/src/profiler.cpp b/src/profiler.cpp index 53ccb97e..fba9d559 100644 --- a/src/profiler.cpp +++ b/src/profiler.cpp @@ -28,6 +28,7 @@ #endif #include "utils/mutex.h" +#include "fceu.h" #include "profiler.h" #if defined(WIN32) @@ -84,7 +85,7 @@ static void calibrateTSC(void) printf("QueryPerformanceFrequency FAILED!\n"); } #endif - printf("Running TSC Calibration: %i sec...\n", numSamples); + FCEU_printf("Running TSC Calibration: %i sec...\n", numSamples); for (int i=0; i( td_avg / td.toSeconds() ); - printf("%i Calibration: %f sec TSC:%llu TSC Freq: %f MHz\n", i, td.toSeconds(), + FCEU_printf("%i Calibration: %f sec TSC:%llu TSC Freq: %f MHz\n", i, td.toSeconds(), static_cast(td.tsc), static_cast(timeStampRecord::tscFreq) * 1.0e-6 ); } } @@ -195,13 +196,13 @@ profileFuncScoped::~profileFuncScoped(void) //------------------------------------------------------------------------- profilerFuncMap::profilerFuncMap(void) { - printf("profilerFuncMap Constructor: %p\n", this); + //printf("profilerFuncMap Constructor: %p\n", this); pMgr.addThreadProfiler(this); } //------------------------------------------------------------------------- profilerFuncMap::~profilerFuncMap(void) { - printf("profilerFuncMap Destructor: %p\n", this); + //printf("profilerFuncMap Destructor: %p\n", this); pMgr.removeThreadProfiler(this); for (auto it = _map.begin(); it != _map.end(); it++) @@ -260,7 +261,7 @@ profilerManager::profilerManager(void) { calibrateTSC(); - printf("profilerManager Constructor\n"); + //printf("profilerManager Constructor\n"); if (pLog == nullptr) { pLog = stdout; @@ -269,7 +270,7 @@ profilerManager::profilerManager(void) profilerManager::~profilerManager(void) { - printf("profilerManager Destructor\n"); + //printf("profilerManager Destructor\n"); { autoScopedLock aLock(threadListMtx); threadList.clear(); diff --git a/vc/vc14_fceux.vcxproj b/vc/vc14_fceux.vcxproj index f5197ad8..d37cff0f 100644 --- a/vc/vc14_fceux.vcxproj +++ b/vc/vc14_fceux.vcxproj @@ -1007,6 +1007,7 @@ xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)" + @@ -1136,6 +1137,7 @@ xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)" +