[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/SF_Exception.xba |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e234ade7716760391c2d9e8c01b0a401072115c
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Fri Dec 18 17:46:13 2020 +0100
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Sat Dec 19 12:08:06 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: I37995dd60769d598cafb3afb415af81ea32256c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107974
    Tested-by: Jean-Pierre Ledure <jp at ledure.be>
    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 30da6907f4f5..7d84fc8ed919 100644
--- a/wizards/source/scriptforge/SF_Exception.xba
+++ b/wizards/source/scriptforge/SF_Exception.xba
@@ -262,7 +262,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
@@ -1104,4 +1104,4 @@ Private Function _Repr() As String
 End Function	'	ScriptForge.SF_Exception._Repr
 
 REM ============================================ END OF SCRIPTFORGE.SF_EXCEPTION
-</script:module>
+</script:module>
\ No newline at end of file