[Libreoffice-commits] core.git: desktop/source

[Platon Pronko (via logerrit)]

 desktop/source/app/app.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 150d4c8b66a5d4e32a97a2a7e25e6fb632cfd40c
Author:     Platon Pronko <platon7pronko at gmail.com>
AuthorDate: Mon Oct 19 17:39:08 2020 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 20 08:06:32 2020 +0200

    remove unnecessary `if (!true) return;` statement from Desktop::Init()
    
    Seems that this specific piece of code was introduced in
    commit bc66bf4608557d757555aef1f46abf8a15c3538b by Noel Grandin,
    where `if (true)` wrapper was removed and `if (!true) return;`
    seems to have been left over.
    
    But the original `if (true)` statement was introduced in commit
    4d258787559426e1e2a0279888eb669622889899 by Michael Meeks, where
    `if ( m_aBootstrapError == BE_OK )` before starting IPC thread
    was replaced with `if (true)`. I asked on IRC and they were not
    sure for the reason of this change, so I will add Michael Meeks
    as a reviewer of this patch, just in case.
    
    Change-Id: I1ffb781464fa2fde152eb21bc61e4b244e8812d3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104530
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1276a2c598f2..04f64621c059 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -484,9 +484,6 @@ void Desktop::Init()
         }
     }
 
-    if ( !(true) )
-        return;
-
     // start ipc thread only for non-remote offices
     RequestHandler::Status aStatus = RequestHandler::Enable(true);
     if ( aStatus == RequestHandler::IPC_STATUS_PIPE_ERROR )