1 files changed, 2 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 9eaa56870..6178ae30a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -52,7 +52,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
     [TangoCreateWhenRegistered]
-    public class MainViewVM : StudioViewModel<DeveloperModule>
+    public class MainViewVM : StudioViewModel
     {
         private static object _syncLock = new object();
         private const string EMB_FORMATS_EXPORT = "Baby Lock (PES)|*.pes|Tajima (DST)|*.dst|EXP|*.exp|PCS|*.pcs|HUS|*.hus|KSM|*.ksm";
@@ -699,7 +699,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             PushProcessParametersCommand = new RelayCommand(PushProcessParameters, () => SelectedRML != null && CanWork && SelectedRML.ProcessParametersTablesGroups.Count > 0 && SelectedProcessParametersTable != null && MachineOperator != null);
             ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && CanWork);
             DisplayJobEmbroideryFileCommand = new RelayCommand<Job>(DisplayJobEmbroideryFile, () => CanWork);
-            ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork);
+            ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork && SelectedMachine != null);
 
             ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
 
@@ -725,8 +725,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         public override void OnApplicationReady()
         {
-            base.OnApplicationReady();
-
             _settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
             SelectedJobs = new ObservableCollection<Job>();
@@ -1348,7 +1346,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private void EditRML()
         {
             LogManager.Log(String.Format("Requesting DB module for RML {0} editing...", SelectedRML.Name));
-            ApplicationManager.RequestModule("Data Base", SelectedRML);
         }
 
         /// <summary>
@@ -1713,7 +1710,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private void EditMachine()
         {
             LogManager.Log(String.Format("Requesting machine designer module for machine {0} editing...", SelectedMachine.SerialNumber));
-            ApplicationManager.RequestModule("Machine Designer", SelectedMachine);
         }
 
         #endregion