From 357934fcdec7ae66213d4729ee1b879ab7ec5793 Mon Sep 17 00:00:00 2001 From: Ben Saine Date: Mon, 17 Jan 2022 16:41:29 +0000 Subject: [PATCH 1/2] Resolve "Dragging from player trade to inventory takes two tries" --- ryzom/client/src/interface_v3/action_handler_item.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp index ff4034b3d..f931f1d76 100644 --- a/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -747,6 +747,10 @@ public: CInterfaceElement *pElt = CWidgetManager::getInstance()->getElementFromId(src); CDBCtrlSheet *pCSSrc = dynamic_cast(pElt); CDBCtrlSheet *pCSDst = dynamic_cast(pCaller); + + // end drag + getInventory().endDrag(); + if ((pCSSrc == NULL) || (pCSDst == NULL)) return; if (pCSSrc->getType() == CCtrlSheetInfo::SheetType_Item) From db86219eabd87c14b5daad858a8cfa17f0481bbe Mon Sep 17 00:00:00 2001 From: Nuno Date: Tue, 1 Feb 2022 15:34:11 +0100 Subject: [PATCH 2/2] Added NL_NO_ASSERT to remove asserts in server --- nel/include/nel/misc/debug.h | 2 +- nel/include/nel/misc/types_nl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nel/include/nel/misc/debug.h b/nel/include/nel/misc/debug.h index 9b6e48376..67c6837da 100644 --- a/nel/include/nel/misc/debug.h +++ b/nel/include/nel/misc/debug.h @@ -380,7 +380,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); #define nlassume(exp) do { } while (0) #endif -#ifdef NL_NO_DEBUG +#ifdef NL_NO_ASSERT # define nlassert(exp) nlassume(exp) # define nlassertonce(exp) nlassume(exp) # define nlassertex(exp, str) nlassume(exp) diff --git a/nel/include/nel/misc/types_nl.h b/nel/include/nel/misc/types_nl.h index 5af1ce3f3..b8d888932 100644 --- a/nel/include/nel/misc/types_nl.h +++ b/nel/include/nel/misc/types_nl.h @@ -274,7 +274,7 @@ //#define NL_NO_DEBUG #undef NL_NO_DEBUG - +#define NL_NO_ASSERT // Standard types