From 3e6f0bed78f3763499373423f9e4d83abe768a42 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 17 Apr 2016 12:45:34 -0400
Subject: [PATCH] fix bugs in previous

---
 src/Dependencies.cpp | 4 +++-
 src/DirManager.cpp   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp
index 5eb050d51..17310868a 100644
--- a/src/Dependencies.cpp
+++ b/src/Dependencies.cpp
@@ -405,7 +405,7 @@ void DependencyDialog::PopulateList()
 
    mHasMissingFiles = false;
    mHasNonMissingFiles = false;
-   unsigned int i;
+   long i = 0;
    for (const auto &aliasedFile : mAliasedFiles) {
       const wxFileName &fileName = aliasedFile.mFileName;
       wxLongLong byteCount = (aliasedFile.mByteCount * 124) / 100;
@@ -426,6 +426,8 @@ void DependencyDialog::PopulateList()
       }
       mFileListCtrl->SetItem(i, 1, Internat::FormatSize(byteCount));
       mFileListCtrl->SetItemData(i, long(bOriginalExists));
+
+      ++i;
    }
 
    wxString msg = kStdMsg;
diff --git a/src/DirManager.cpp b/src/DirManager.cpp
index bd15e4793..5644ddf0a 100644
--- a/src/DirManager.cpp
+++ b/src/DirManager.cpp
@@ -1336,13 +1336,13 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName)
 
             if (b->IsAlias() && ab->GetAliasedFileName() == fName)
             {
-               ab->ChangeAliasedFileName(std::move(renamedFileName));
+               ab->ChangeAliasedFileName(wxFileNameWrapper{ renamedFileName });
                ab->UnlockRead();
                wxPrintf(_("Changed block %s to new alias name\n"), b->GetFileName().GetFullName().c_str());
 
             }
             else if (!b->IsDataAvailable() && db->GetEncodedAudioFilename() == fName) {
-               db->ChangeAudioFile(std::move(renamedFileName));
+               db->ChangeAudioFile(wxFileNameWrapper{ renamedFileName });
                db->UnlockRead();
             }
             ++iter;