Fixed #79

And updated resource version.
ousnius · Oct 27, 2015 · 20fe033 · 20fe033
1 parent d12eaec
commit 20fe033
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/BodySlide.rc b/BodySlide.rc
diff --git a/GroupManager.cpp b/GroupManager.cpp
@@ -68,21 +68,20 @@ void GroupManager::RefreshUI(const bool& clearGroups) {
 }
 
 void GroupManager::OnLoadGroup(wxFileDirPickerEvent& event) {
-	// Clear and load group file
-	currentGroupFile.Clear();
-	currentGroupFile.Open(event.GetPath().ToStdString());
-	if (currentGroupFile.fail())
+	// Load group file
+	SliderSetGroupFile groupFile(event.GetPath().ToStdString());
+	if (groupFile.fail())
 		return;
 
 	groupMembers.clear();
 	btRemoveGroup->Enable();
 
 	// Fill group member map
 	vector<string> groupNames;
-	currentGroupFile.GetGroupNames(groupNames, true, true);
+	groupFile.GetGroupNames(groupNames, true, true);
 	for (auto &grp : groupNames) {
 		SliderSetGroup group;
-		if (currentGroupFile.GetGroup(grp, group))
+		if (groupFile.GetGroup(grp, group))
 			return;
 
 		vector<string> members;
@@ -91,18 +90,20 @@ void GroupManager::OnLoadGroup(wxFileDirPickerEvent& event) {
 	}
 
 	wxFileName fileInfo(event.GetPath());
-	fileName = fileInfo.GetFullName();
+	fileName = fileInfo.GetFullPath();
 	RefreshUI(true);
 }
 
 void GroupManager::OnSaveGroup(wxCommandEvent& WXUNUSED(event)) {
+	SliderSetGroupFile groupFile;
+	groupFile.New(fileName.ToStdString());
 	for (auto &grp : groupMembers) {
 		SliderSetGroup group;
 		group.SetName(grp.first);
 		group.AddMembers(grp.second);
-		currentGroupFile.UpdateGroup(group);
+		groupFile.UpdateGroup(group);
 	}
-	currentGroupFile.Save();
+	groupFile.Save();
 
 	dirty = false;
 	btSave->Enable(dirty & !fileName.empty());
@@ -113,16 +114,17 @@ void GroupManager::OnSaveGroupAs(wxCommandEvent& WXUNUSED(event)) {
 	if (file.ShowModal() != wxID_OK)
 		return;
 
-	currentGroupFile.New(file.GetPath().ToStdString());
+	SliderSetGroupFile groupFile;
+	groupFile.New(file.GetPath().ToStdString());
 	for (auto &grp : groupMembers) {
 		SliderSetGroup group;
 		group.SetName(grp.first);
 		group.AddMembers(grp.second);
-		currentGroupFile.UpdateGroup(group);
+		groupFile.UpdateGroup(group);
 	}
 
-	currentGroupFile.Save();
-	fileName = file.GetFilename();
+	groupFile.Save();
+	fileName = file.GetPath();
 
 	dirty = false;
 	btSave->Enable(dirty & !fileName.empty());

diff --git a/GroupManager.h b/GroupManager.h
@@ -27,7 +27,6 @@ class GroupManager : public wxDialog {
 
 	bool dirty = false;
 	wxString fileName;
-	SliderSetGroupFile currentGroupFile;
 	map<string, vector<string>> groupMembers;
 	vector<string> allOutfits;