Clean up a couple things in lumina-fm:

1) Fix the double-run of the background dir checker when changing directories.
2) Add the file overwrite checks to the cut procedures in the backend.
3) If a file/dir is copied onto itself, just skip it rather than erroring.

1 files changed, 5 insertions, 2 deletions

diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp
index fa892dfd..9d66bc36 100644
--- a/lumina-fm/MainUI.cpp
+++ b/lumina-fm/MainUI.cpp
@@ -442,9 +442,11 @@ void MainUI::setCurrentDir(QString dir){
   ui->tool_goToPlayer->setVisible(false);
   ui->tool_goToRestore->setVisible(false);
   ui->tool_goToImages->setVisible(false);
-  //if(olddir!=rawdir){
+  //Make sure the shortcut buttons are enabled as necessary
+  // If the dir is already loaded into the fsmodel cache it will not emit the directoryLoaded() signal
+  if(rawdir == olddir){
     emit DirChanged(rawdir); //This will be automatically run when a new dir is loaded
-  //}
+  }
   if(isUserWritable){ ui->label_dir_stats->setText(""); }
   else{ ui->label_dir_stats->setText(tr("Limited Access Directory")); }
   ui->tool_addToDir->setVisible(isUserWritable);
@@ -825,6 +827,7 @@ void MainUI::reloadDirectory(){
 
 void MainUI::currentDirectoryLoaded(){
   //The directory was just loaded: refresh the action buttons as neccesary
+  // NOTE: This is only "caught" when a *new* directory is loaded into the model
   ui->tool_goToPlayer->setVisible(false);
   ui->tool_goToRestore->setVisible(false);
   ui->tool_goToImages->setVisible(false);