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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/SF_Exception.xba |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 862637bfffd688a15b5c49768657aa18997d0e54
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Fri Dec 18 17:40:39 2020 +0100
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Sat Dec 19 10:50:13 2020 +0100

    ScriptForge - (SF_Exception) Fix console start in modal mode
    
    When the console is first started in non-modal mode
    and the launching macro stops normally,
    
    when the console is then requested to restart in modal mode,
    it does not start
    
    This patch forces a reinit of the console dialog when it is
    started in modal mode, whatever its status
    
    Change-Id: Ia687661e60259c235f2b45decf9bb6e342d3f26b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107973
    Tested-by: Jean-Pierre Ledure <jp at ledure.be>
    Tested-by: Jenkins
    Reviewed-by: Jean-Pierre Ledure <jp at ledure.be>

diff --git a/wizards/source/scriptforge/SF_Exception.xba b/wizards/source/scriptforge/SF_Exception.xba
index c3f9c96dc93a..c4a0f6c85370 100644
--- a/wizards/source/scriptforge/SF_Exception.xba
+++ b/wizards/source/scriptforge/SF_Exception.xba
@@ -268,7 +268,7 @@ Try:
 	With _SF_
 		bConsoleActive = False
 		If Not IsNull(.ConsoleDialog) Then bConsoleActive = .ConsoleDialog._IsStillAlive(False)		'	False to not raise an error
-		If bConsoleActive Then
+		If bConsoleActive And Modal = False Then
 			'	Bring to front
 			.ConsoleDialog.Activate()
 		Else