3 files changed, 21 insertions, 4 deletions
diff --git a/src/preview/PreviewController.cpp b/src/preview/PreviewController.cpp
index 651db32..4b8bd80 100644
--- a/src/preview/PreviewController.cpp
+++ b/src/preview/PreviewController.cpp
@@ -119,7 +119,13 @@ void PreviewController::Report(std::string message)
 
 void PreviewController::FavouriteSave()
 {
-	previewModel->SetFavourite(true);
+	if(previewModel->GetSave() && Client::Ref().GetAuthUser().ID)
+	{
+		if(previewModel->GetSave()->Favourite)
+			previewModel->SetFavourite(false);
+		else
+			previewModel->SetFavourite(true);
+	}
 }
 
 void PreviewController::OpenInBrowser()
diff --git a/src/preview/PreviewModel.cpp b/src/preview/PreviewModel.cpp
index b0cca7f..07eef2e 100644
--- a/src/preview/PreviewModel.cpp
+++ b/src/preview/PreviewModel.cpp
@@ -71,7 +71,7 @@ void * PreviewModel::updateSaveCommentsT()
 
 void PreviewModel::SetFavourite(bool favourite)
 {
-	//if(save)
+	if(save)
 	{
 		Client::Ref().FavouriteSave(save->id, favourite);
 		save->Favourite = favourite;
diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp
index 2bca6cc..0c5fa1f 100644
--- a/src/preview/PreviewView.cpp
+++ b/src/preview/PreviewView.cpp
@@ -88,7 +88,7 @@ PreviewView::PreviewView():
 		}
 	};
 
-	favButton = new ui::Button(ui::Point(50, Size.Y-19), ui::Point(51, 19), "Fav.");
+	favButton = new ui::Button(ui::Point(50, Size.Y-19), ui::Point(51, 19), "Fav");
 	favButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	favButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	favButton->SetIcon(IconFavourite);
 	favButton->SetActionCallback(new FavAction(this));
@@ -380,9 +380,20 @@ void PreviewView::NotifySaveChanged(PreviewModel * sender)
 		viewsLabel->SetText("\bgViews:\bw " + format::NumberToString<int>(save->Views));
 		saveDescriptionLabel->SetText(save->Description);
 		if(save->Favourite)
-			favButton->Enabled = false;
+		{
+			favButton->Enabled = true;
+			favButton->SetText("Unfav");
+		}
 		else if(Client::Ref().GetAuthUser().ID)
+		{
 			favButton->Enabled = true;
+			favButton->SetText("Fav");
+		}
+		else
+		{
+			favButton->SetText("Fav");
+			favButton->Enabled = false;
+		}
 
 		if(save->GetGameSave())
 		{