Update upstream source from tag 'upstream/5.2.0Beta2.1'

Update to upstream version '5.2.0Beta2.1'
with Debian dir 1576f25f4c1496abfed44af31ead67d32c7be650

1 files changed, 10 insertions, 0 deletions

diff --git a/app/wlib/gtklib/ixhelp.c b/app/wlib/gtklib/ixhelp.c
index f1e3983..5079f61 100644
--- a/app/wlib/gtklib/ixhelp.c
+++ b/app/wlib/gtklib/ixhelp.c
@@ -404,6 +404,13 @@ void wHelp(const char * topic)
 {
     char *htmlFile;
 
+    //Take off any topic characters after a '-'
+
+    if (!topic || !topic[0]) return;
+
+
+    if (!CheckHelpTopicExists(topic)) return;
+
     if (!wHelpWindow) {
         directory = malloc(BUFSIZ);
         assert(directory != NULL);
@@ -417,6 +424,7 @@ void wHelp(const char * topic)
 
     /* need space for the 'html' extension plus dot plus \0 */
     htmlFile = malloc(strlen(topic) + 6);
+
     assert(htmlFile != NULL);
 
     sprintf(htmlFile, "%s.html", topic);
@@ -424,4 +432,6 @@ void wHelp(const char * topic)
     load_into_view(htmlFile, MAIN_VIEW);
     gtk_widget_show_all(wHelpWindow);
     gtk_window_present(GTK_WINDOW(wHelpWindow));
+
+    free(htmlFile);
 }