Working on PPC...

1 files changed, 19 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
index 3882fb486..688f82fe7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs
@@ -33,7 +33,23 @@ namespace Tango.PPC.Storage.ViewModels
         public StorageNavigationRequest Request
         {
             get { return _request; }
-            set { _request = value; RaisePropertyChangedAuto(); }
+            set
+            {
+                _request = value;
+                RaisePropertyChangedAuto();
+
+                if (_request != null)
+                {
+                    FileName = _request.DefaultFileName;
+                }
+            }
+        }
+
+        private String _fileName;
+        public String FileName
+        {
+            get { return _fileName; }
+            set { _fileName = value; RaisePropertyChangedAuto(); SaveCommand.RaiseCanExecuteChanged(); }
         }
 
         public RelayCommand<ExplorerFileItem> FileSelectedCommand { get; set; }
@@ -43,7 +59,7 @@ namespace Tango.PPC.Storage.ViewModels
         public MainViewVM()
         {
             FileSelectedCommand = new RelayCommand<ExplorerFileItem>(OnFileSelected);
-            SaveCommand = new RelayCommand(OnSaveCommand);
+            SaveCommand = new RelayCommand(OnSaveCommand, (x) => !String.IsNullOrWhiteSpace(FileName));
             Request = new StorageNavigationRequest();
         }
 
@@ -161,7 +177,7 @@ namespace Tango.PPC.Storage.ViewModels
         {
             _selectedItem = new ExplorerFileItem()
             {
-                Path = CurrentPath + "\\" + Request.DefaultFileName,
+                Path = CurrentPath + "\\" + FileName,
             };
             NavigationManager.NavigateBack();
         }