[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - desktop/win32

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 12:44:03 UTC 2018


 desktop/win32/source/QuickStart/QuickStart.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7e4e6b41e80309c203a4eab1f5cc03b47c31faa
Author:     brinzing <oliver.brinzing at gmx.de>
AuthorDate: Sat Oct 27 17:32:38 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Oct 30 13:43:40 2018 +0100

    possible fix for tdf#120928 - quickstart --killtray throws exception
    
    Change-Id: Id4081439075f4beecc2b0e4aed035d5ee28a2cfd
    Reviewed-on: https://gerrit.libreoffice.org/62429
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit a41d7ee25ea5057cd887c67d33d42f4c764f9c77)
    Reviewed-on: https://gerrit.libreoffice.org/62441
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx
index 0cc673c77191..f8342229c9e3 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -89,7 +89,7 @@ int APIENTRY wWinMain(HINSTANCE /*hInstance*/,
 
     for ( int i = 1; i < __argc; i++ )
     {
-        if ( 0 == strcmp( __argv[i], "--killtray" ) )
+        if ( 0 == wcscmp( __wargv[i], L"--killtray" ) )
         {
             HWND hwndTray = FindWindowW( QUICKSTART_CLASSNAME, nullptr );
 


More information about the Libreoffice-commits mailing list