Merge pull request #41276 from martinrhan/branch_bugfix_wield

Bugfix for cancelling unwielding when wielding an item and has item in hand
CleverRaven · Jun 14, 2020 · 5e807d8 · 5e807d8
2 parents f3d4575 + 93809d7
commit 5e807d8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/game.cpp b/src/game.cpp
@@ -8957,7 +8957,9 @@ void game::wield( item_location loc )
             add_msg( m_info, "%s", ret.c_str() );
         }
 
-        u.unwield();
+        if( !u.unwield() ) {
+            return;
+        }
 
         if( is_unwielding ) {
             if( !u.martial_arts_data.selected_is_none() ) {