Fixed bug which caused buttons not to be displayed and game to crash

src/display.cpp

@@ -358,6 +358,8 @@ void display::draw(bool update,bool force)
 					SDL_FreeSurface(image);
 					image = new_image;
 					sidebarScaling_ = static_cast<double>(image->h)/768.0;
+				} else {
+					std::cerr << "Could not scale image\n";
 				}
 			}
 

src/sdl_utils.cpp

@@ -52,8 +52,8 @@ SDL_Surface* scale_surface(SDL_Surface* surface, int w, int h)
 
 			const int dstpad = dstxpad*ydst;
 
-			srclock.pixels()[ydst*w + xdst + dstpad] =
-			             dstlock.pixels()[ysrcint*surface->w + xsrcint];
+			dstlock.pixels()[ydst*w + xdst + dstpad] =
+			             srclock.pixels()[ysrcint*surface->w + xsrcint];
 		}
 	}
 

src/sdl_utils.hpp

@@ -19,6 +19,7 @@
 #include "SDL.h"
 
 #include <cstdlib>
+#include <iostream>
 #include <string>
 
 struct free_sdl_surface {
@@ -89,14 +90,17 @@ struct surface_lock
 			const int res = SDL_LockSurface(surface_);
 			if(res == 0) {
 				locked_ = true;
+				std::cerr << "locked surface\n";
 			}
 		}
 	}
 
 	~surface_lock()
 	{
-		if(locked_)
+		if(locked_) {
+			std::cerr << "unlocking surface\n";
 			SDL_UnlockSurface(surface_);
+		}
 	}
 
 	short* pixels() { return reinterpret_cast<short*>(surface_->pixels); }