diff --git a/TitanScriptGui/TitanScriptGui.cpp b/TitanScriptGui/TitanScriptGui.cpp
index 6052ccf..39442f6 100644
--- a/TitanScriptGui/TitanScriptGui.cpp
+++ b/TitanScriptGui/TitanScriptGui.cpp
@@ -133,30 +133,47 @@ INT_PTR CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         }
         case IDC_COPY: {
             //get lines
-            int cnt = SendMessage(hLogBox, LB_GETCOUNT, 0, 0);
-            TCHAR buf[MAX_LOG_LINE_LENGTH] = {0};
-            TCHAR copy[MAX_LOG_LINE_COUNT*MAX_LOG_LINE_LENGTH] = {0};
+            LRESULT cnt = SendMessage(hLogBox, LB_GETCOUNT, 0, 0);
 
-            for(int i=0; i<MAX_LOG_LINE_COUNT; i++) {
-                SendMessage(hLogBox, LB_GETTEXT, i, (LPARAM)buf);
-                lstrcat(copy, buf);
-                lstrcat(copy, L"\n");
+            if (cnt != 0 && cnt != LB_ERR)
+            {
+                TCHAR buf[MAX_LOG_LINE_LENGTH] = {0};
+                TCHAR copy[MAX_LOG_LINE_COUNT*MAX_LOG_LINE_LENGTH*3] = {0};
+
+                for(LRESULT i=0; i<cnt; i++) {
+                    if (SendMessage(hLogBox, LB_GETTEXT, i, (LPARAM)buf) != LB_ERR)
+                    {
+                        _tcscat(copy, buf);
+                        _tcscat(copy, L"\r\n");
+                    }
+                }
+
+                //copy to clipboard
+                HGLOBAL clipbuffer;
+                TCHAR* buffer;
+                clipbuffer = GlobalAlloc(GMEM_MOVEABLE, (_tcslen(copy) + 1) * sizeof(TCHAR));
+                if (clipbuffer)
+                {
+                    buffer = (TCHAR*)GlobalLock(clipbuffer);
+                    _tcscpy(buffer, copy);
+                    GlobalUnlock(clipbuffer);
+                    OpenClipboard(NULL);
+                    EmptyClipboard();
+                    UINT format;
+#ifdef UNICODE
+                    format = CF_UNICODETEXT;
+#else
+                    format = CF_OEMTEXT;
+#endif
+                    SetClipboardData(format, clipbuffer);
+                }
+
+                CloseClipboard();
             }
 
-            //copy to clipboard
-            HGLOBAL clipbuffer;
-            TCHAR* buffer;
-            clipbuffer = GlobalAlloc(GMEM_DDESHARE, sizeof(copy));
-            buffer = (TCHAR*)GlobalLock(clipbuffer);
-            wcscpy(buffer, copy);
-            GlobalUnlock(clipbuffer);
-            OpenClipboard(NULL);
-            EmptyClipboard();
-            SetClipboardData(CF_UNICODETEXT,clipbuffer);
-            CloseClipboard();
 
             break;
-        }
+                       }
         }
 
     }
diff --git a/TitanScriptGui/TitanScriptGui.vcxproj b/TitanScriptGui/TitanScriptGui.vcxproj
index e410c3e..d597500 100644
--- a/TitanScriptGui/TitanScriptGui.vcxproj
+++ b/TitanScriptGui/TitanScriptGui.vcxproj
@@ -122,6 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -142,6 +143,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>