From fd0b43824dee3a8fce3054a97ac34c2a63a8fa1f Mon Sep 17 00:00:00 2001 From: vincents Date: Fri, 19 Sep 2008 21:19:40 +0000 Subject: [PATCH] starter: use UTF8 system error message, maybe fixes issue #12185 git-svn-id: trunk@16658 - --- ide/lazarusmanager.pas | 9 ++++++--- ide/startlazarus.lpi | 23 +++++++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas index e306559a06..9b6c9df91f 100644 --- a/ide/lazarusmanager.pas +++ b/ide/lazarusmanager.pas @@ -160,20 +160,23 @@ begin begin if FileExistsUTF8(BackupFileName) then if not DeleteFileUTF8(BackupFileName) then begin - MessageDlg(format('Can''t delete "%s"'#13'%s', [BackupFileName, SysErrorMessage(GetLastOSError)]), + MessageDlg(format('Can''t delete "%s"'#13'%s', + [BackupFileName, SysErrorMessageUTF8(GetLastOSError)]), mtError, [mbOK], 0); Result := mrAbort; exit; end; if not RenameFileUTF8(CurFilename, BackupFileName) then begin - MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s', [FLazarusPath, BackupFileName, SysErrorMessage(GetLastOSError)]), + MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s', + [FLazarusPath, BackupFileName, SysErrorMessageUTF8(GetLastOSError)]), mtError, [mbOK], 0); Result := mrAbort; exit; end; end; if not RenameFileUTF8(NewFileName, CurFilename) then begin - MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s', [NewFileName, FLazarusPath, SysErrorMessage(GetLastOSError)]), + MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s', + [NewFileName, FLazarusPath, SysErrorMessageUTF8(GetLastOSError)]), mtError, [mbOK], 0); Result := mrAbort; exit; diff --git a/ide/startlazarus.lpi b/ide/startlazarus.lpi index 121b3878be..283737cba7 100644 --- a/ide/startlazarus.lpi +++ b/ide/startlazarus.lpi @@ -1,16 +1,17 @@ - + - + + @@ -18,7 +19,7 @@ - + @@ -35,7 +36,7 @@ - + @@ -45,17 +46,23 @@ + + + + + + - + - - - + + +