[vlc-commits] [Git][videolan/vlc][3.0.x] lua: don't use | operator on VLC errors

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
33e838f0 by Steve Lhomme at 2024-09-22T12:37:19+00:00
lua: don't use | operator on VLC errors

This could end up with unknown/invalid error values.

(cherry picked from commit 586b28f4aab1f936d666bd3dab7904793c3012d7)

- - - - -


1 changed file:

- modules/lua/extension.c


Changes:

=====================================
modules/lua/extension.c
=====================================
@@ -971,7 +971,10 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
         i_ret = VLC_EGENERIC;
     }
 
-    i_ret |= lua_DialogFlush( L );
+    if (i_ret != VLC_SUCCESS)
+        lua_DialogFlush( L );
+    else
+        i_ret = lua_DialogFlush( L );
 
 exit:
     return i_ret;
@@ -1013,7 +1016,10 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
         i_ret = VLC_EGENERIC;
     }
 
-    i_ret |= lua_DialogFlush( L );
+    if (i_ret != VLC_SUCCESS)
+        lua_DialogFlush( L );
+    else
+        i_ret = lua_DialogFlush( L );
     if( i_ret < VLC_SUCCESS )
     {
         msg_Dbg( p_mgr, "Something went wrong in %s (%s:%d)",



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/33e838f0260591fedcc55776121eba03026d9b9e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/33e838f0260591fedcc55776121eba03026d9b9e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance