Cleanup

src/plugin/PluginDebug.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginDebug.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 
 
 class CPluginDebugLock : public CPluginMutex
 {
 
@@ skipping 26 matching lines @@
 #endif
 
   if (CPluginSettings::HasInstance())
   {
 #ifdef ENABLE_DEBUG_SPLIT_FILE
     CPluginSettings* settings = CPluginSettings::GetInstance();
 
     bool isWorkingThread = settings->IsWorkingThread(dwThreadId);
 
     CString processor;
-    if (settings->IsMainProcess(dwProcessId) && settings->IsMainThread(dwThreadId))
-    {
-      processor = L"main_thread";
-    }
-    else if (settings->IsMainProcess(dwProcessId) && settings->IsMainUiThread(dwThreadId))
-    {
-      processor = L"main_ui";
-    }
-    else if (isWorkingThread)
-    {
-      processor = L"tab" + settings->GetTabNumber() + L"_thread";
-    }
+    wchar_t tmp[10];
+    _itow_s(::GetCurrentProcessId(), tmp, 10);

[Felix Dahlke, 2013/07/25 13:52:33]

It'd be easier/safer to use std::wstringstream here.

std::wstringstream stream;
stream << GetCurrentProcessId();
std::wstring processId = stream.str();

+    if (isWorkingThread)
+      processor = L"tab" + CString(tmp) + L"_thread";
     else
-    {
-      processor = L"tab" + settings->GetTabNumber() + L"_ui";
-    }
+      processor = L"tab" + CString(tmp) + L"_ui";
 #else
     if (dwProcessId == 0)
     {
       dwProcessId = ::GetCurrentProcessId();
     }
     if (dwThreadId == 0)
     {
       dwThreadId = ::GetCurrentThreadId();
     }
 
@@ skipping 174 matching lines @@
     srcTrunc = src.Left(67) + L"..." + src.Right(30);
   }
 
   CString blocking;
   blocking.Format(L"Ignored  %-12s  %s  %s", type, domain.IsEmpty()? L"-" : domain, srcTrunc);
 
   DebugResult(blocking);
 }
 
 #endif // ENABLE_DEBUG_RESULT_IGNORED