Merge remote-tracking branch 'origin/dev' into dev

oxygine/src/core/STDFileSystem.cpp

@@ -86,6 +86,9 @@ namespace oxygine
         int _openedFiles = 0;
         oxHandle* oxFileOpen(const char* filename, const char* mode)
         {
+            if (*mode == 's')
+                ++mode;
+            
             LOGD("oxFileOpen %s", filename);
             oxHandle* h = oxFileOpen_(filename, mode);
             if (h)

oxygine/src/core/ThreadDispatcher.h

@@ -106,15 +106,18 @@ namespace oxygine
         void _popMessage(message&);
         void _popMessageNoCB(message&);
         void _replyLast(void* val);
-        unsigned int _id;
-        void*   _result;
-        int _replyingTo;
-
+        
+        
+        pthread_mutex_t _mutex;
+        pthread_cond_t _cond;
+        
         typedef std::vector<message> messages;
         messages _events;
         message _last;
-        pthread_cond_t _cond;
-        pthread_mutex_t _mutex;
+        
+        void*   _result;
+        unsigned int _id;
+        int _replyingTo;
     };
 
     typedef  ThreadDispatcher ThreadMessages;

oxygine/src/core/file.cpp

@@ -102,6 +102,7 @@ namespace oxygine
 
         handle open(const char* file_, const char* mode, error_policy ep)
         {
+            
 #ifdef OX_DEBUG
             if (!strstr(mode, "b"))
                 log::warning("file::open for file '%s' should be called with 'b' (means binary) flag", file_);

oxygine/src/core/oxygine.cpp

@@ -526,10 +526,16 @@ namespace oxygine
 
         bool  beginRendering(window w)
         {
+            
 #ifdef OXYGINE_SDL
             SDL_Window* wnd = w;
             if (!wnd)
+            {
+                if (!focus)
+                    return false;
+                
                 wnd = _window;
+            }
             SDL_GL_MakeCurrent(wnd, _context);
 #endif