Fixes in options, hotkeys and viplist

src/client/game.cpp

@@ -1129,6 +1129,11 @@ void Game::removeVip(int playerId)
 {
     if(!canPerformGameAction())
         return;
+    
+    auto it = m_vips.find(playerId);
+    if(it == m_vips.end())
+        return;
+    m_vips.erase(it);
     m_protocolGame->sendRemoveVip(playerId);
 }
 

src/framework/ui/uimanager.cpp

@@ -349,11 +349,13 @@ void UIManager::importStyleFromOTML(const OTMLNodePtr& styleNode)
     OTMLNodePtr oldStyle = m_styles[name];
 
     // Warn about redefined styles
+    /*
     if(!g_app.isRunning() && (oldStyle && !oldStyle->valueAt("__unique", false))) {
         auto it = m_styles.find(name);
         if(it != m_styles.end())
             g_logger.warning(stdext::format("style '%s' is being redefined", name));
     }
+    */
 
     if(!oldStyle || !oldStyle->valueAt("__unique", false) || unique) {
         OTMLNodePtr originalStyle = getStyle(base);

src/framework/ui/uitextedit.cpp

@@ -41,7 +41,7 @@ UITextEdit::UITextEdit()
     m_maxLength = 0;
     m_editable = true;
     m_selectable = true;
-    m_autoScroll = false;
+    m_autoScroll = true;
     m_changeCursorImage = true;
     m_selectionReference = 0;
     m_selectionStart = 0;