Changeset 2340


Ignore:
Timestamp:
10/30/2011 2:08:50 AM (3 years ago)
Author:
lowjoel
Message:

Merged revision(s) 2339 from trunk/eraser: Fixed initialisation order. The settings panel should be initialised first because it loads settings and may raise a dialog for invalid settings. The scheduler may then be affected and be in a deadlock when it receives events from the Executor instance. Potential fix for http://bbs.heidi.ie/viewtopic.php?f=2&t=8207&p=24805#p24535.

Location:
branches/eraser6/6.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/6.0

  • branches/eraser6/6.0/Eraser/MainForm.cs

    r2265 r2340  
    4141    { 
    4242        private BasePanel CurrPage; 
    43         private SchedulerPanel SchedulerPage = new SchedulerPanel(); 
    44         private SettingsPanel SettingsPage = new SettingsPanel(); 
     43        private SchedulerPanel SchedulerPage; 
     44        private SettingsPanel SettingsPage; 
    4545 
    4646        public MainForm() 
    4747        { 
    4848            InitializeComponent(); 
     49            SettingsPage = new SettingsPanel(); 
     50            SchedulerPage = new SchedulerPanel(); 
    4951            contentPanel.Controls.Add(SchedulerPage); 
    5052            contentPanel.Controls.Add(SettingsPage); 
  • branches/eraser6/6.0/Eraser/Strings.en.resx

    r2327 r2340  
    223223    <value>Task completed</value> 
    224224  </data> 
    225   <data name="Recycle Bin" xml:space="preserve"> 
    226     <value>Recycle Bin</value> 
    227   </data> 
    228   <data name="Cannot erase the selected items" xml:space="preserve"> 
    229     <value>Cannot erase the selected items</value> 
    230   </data> 
    231225  <data name="Import tasks from {0}" xml:space="preserve"> 
    232226    <value>Import tasks from {0}</value> 
     
    295289    <value>(default)</value> 
    296290  </data> 
    297   <data name="Cannot add the selected items" xml:space="preserve"> 
    298     <value>Cannot add the selected items</value> 
    299   </data> 
    300   <data name="Add {0}" xml:space="preserve"> 
    301     <value>Add {0}</value> 
    302   </data> 
    303291  <data name="The task has no data to erase." xml:space="preserve"> 
    304292    <value>The task has no data to erase.</value> 
Note: See TracChangeset for help on using the changeset viewer.