Merge branch 'master' into swf-fixes

mickelson · Nov 13, 2018 · 91e3832 · 91e3832
2 parents e535605 + 2287571
commit 91e3832
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/extlibs/nowide/nowide/cenv.hpp b/extlibs/nowide/nowide/cenv.hpp
@@ -101,7 +101,7 @@ namespace nowide {
     {
         char const *key = string;
         char const *key_end = string;
-        while(*key_end!='=' && key_end!='\0')
+        while(*key_end!='=' && *key_end!='\0')
             key_end++;
         if(*key_end == '\0')
             return -1;

diff --git a/src/fe_overlay.cpp b/src/fe_overlay.cpp
@@ -902,6 +902,7 @@ void FeOverlay::input_map_dialog(
 
 		if ( redraw )
 		{
+			m_fePresent.redraw_surfaces();
 			m_wnd.clear();
 			m_wnd.draw( m_fePresent, t );
 			m_wnd.draw( message, t );
@@ -1335,6 +1336,7 @@ void FeOverlay::init_event_loop( FeEventLoopCtx &ctx )
 
 		if ( m_fePresent.tick() )
 		{
+			m_fePresent.redraw_surfaces();
 			m_wnd.clear();
 			m_wnd.draw( m_fePresent, t );
 
@@ -1422,6 +1424,7 @@ bool FeOverlay::event_loop( FeEventLoopCtx &ctx )
 
 		if ( redraw )
 		{
+			m_fePresent.redraw_surfaces();
 			m_wnd.clear();
 			m_wnd.draw( m_fePresent, t );
 
@@ -1896,6 +1899,7 @@ bool FeOverlay::edit_loop( std::vector<sf::Drawable *> d,
 		if ( m_feSettings.get_current_state( FeInputMap::Left ) || m_feSettings.get_current_state( FeInputMap::Right ))
 			cursor_timer.restart();
 
+		m_fePresent.redraw_surfaces();
 		m_wnd.clear();
 		m_wnd.draw( m_fePresent, t );
 

diff --git a/src/fe_vm.cpp b/src/fe_vm.cpp
@@ -1202,6 +1202,7 @@ void FeVM::on_transition(
 		{
 			video_tick();
 
+			redraw_surfaces();
 			m_window.clear();
 			m_window.draw( *this );
 			m_window.display();