From 45c8db81a24e00bc43d05b7e52909c97a63bc2e0 Mon Sep 17 00:00:00 2001 From: Abdoulaye DIOP Date: Mon, 10 Aug 2015 13:51:00 +0200 Subject: [PATCH] Help couldnt be displayed when loading several modules To reproduce this bug, exec several loaders in the scilab.start file, and try to use the help function Change-Id: Id3ca2b0ff5ab2374e200328f33e460c36fe1e471 --- .../gui/sci_gateway/cpp/sci_helpbrowser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scilab/modules/gui/sci_gateway/cpp/sci_helpbrowser.cpp b/scilab/modules/gui/sci_gateway/cpp/sci_helpbrowser.cpp index df54f33..f587d6a 100644 --- a/scilab/modules/gui/sci_gateway/cpp/sci_helpbrowser.cpp +++ b/scilab/modules/gui/sci_gateway/cpp/sci_helpbrowser.cpp @@ -61,8 +61,8 @@ Function::ReturnValue sci_helpbrowser(typed_list &in, int _iRetCount, typed_list Scierror(999, _("%s: Wrong type for input argument #%d: A string expected."), "helpbrowser", 2); return Function::Error; } - // Scalar String or [] allowed. - if ( !( (in[0]->isString() == true && in[0]->getAs()->isScalar() == true) + // Matrix of String or [] allowed. + if ( !( (in[0]->isString() == true) || (in[0]->isDouble() == true && in[0]->getAs()->isEmpty() == true)) ) { Scierror(999, _("%s: Wrong type for input argument #%d: A string expected."), "helpbrowser", 1); -- 1.7.9.5