Fixed bug which could cause wrong monitor name to be displayed if two MDFs had...

Fixed bug which could cause wrong monitor name to be displayed if two MDFs had very similar filenames.

Resources/UK/Messages

@@ -2,7 +2,7 @@
 _TaskName:Screen configuration
 _Purpose:Configuring the screen
 _Author: Acorn Computers Ltd, 1998
-_Version:0.08 (03-Jun-98)
+_Version:0.08 (21-Jul-98)
 _ConfigText:Screen
 _ConfigHelp:Click SELECT to open the monitor, screen and screen saver configuration window.
 _ConfigSprite:co_screen

UrsulaLog

@@ -41,3 +41,9 @@ Wed 03-Jun-98
 
 Fri 05-Jun-98
   - Clicks on Cancel only re-read settings if click was with adjust.
+
+Checked in.
+
+Tue 21-Jul-98
+  - Fixed bug which could cause wrong monitor name to be displayed
+    if two MDFs had very similar filenames.

c/monitor

@@ -22,6 +22,8 @@
 /*          16-Apr-98: RML: save_monitor_choices now also changes the to the */
 /*                          new setup.                                       */
 /*          01-May-98: RML: Bug fix.                                         */
+/*          21-Jul-98: RML: Bug fix: Monitor name could be displayed wrong   */
+/*                          if two very similar filenames existed.           */
 /*                                                                           */
 /* Copyright  1998 Acorn Computers Ltd., Cambridge, UK.                     */
 /*---------------------------------------------------------------------------*/
@@ -193,11 +195,10 @@ void update_monitor_displayfields(void)
         menus_are_grey=1;
     }
 
-
     /* Update monitor name display */
     for (m=monitors_list; m; m =m->next)
     {
-        if (strncmp(current_monitor_file, m->file_name, strlen(m->file_name))==0)
+        if (strncmp(current_monitor_file, m->file_name, strlen(current_monitor_file))==0)
         {
             error_trap(stringset_set_selected(0, main_window_id, MonitorTypeStringSet, m->monitor_name), 0);
             break;
@@ -534,7 +535,6 @@ static void construct_monitors_list(char *dirname, char* buffer_end)
 
     dirname_end=dirname+strlen(dirname);
 
-
     while(last_item_read!=-1)
     {
         /* Get next entry from directory */