|
@@ -154,37 +154,18 @@ class ConsoleValue
|
|
|
|
|
|
TORQUE_FORCEINLINE bool hasAllocatedData() const
|
|
TORQUE_FORCEINLINE bool hasAllocatedData() const
|
|
{
|
|
{
|
|
- return (isConsoleType() && data != NULL);
|
|
|
|
|
|
+ return (type == ConsoleValueType::cvString || isConsoleType()) && data != NULL;
|
|
}
|
|
}
|
|
|
|
|
|
const char* getConsoleData() const;
|
|
const char* getConsoleData() const;
|
|
|
|
|
|
TORQUE_FORCEINLINE void cleanupData()
|
|
TORQUE_FORCEINLINE void cleanupData()
|
|
{
|
|
{
|
|
- switch (type)
|
|
|
|
- {
|
|
|
|
- case ConsoleValueType::cvConsoleValueType:
|
|
|
|
- if (ct)
|
|
|
|
- {
|
|
|
|
- delete ct;
|
|
|
|
- ct = nullptr;
|
|
|
|
- }
|
|
|
|
- break;
|
|
|
|
- case ConsoleValueType::cvString:
|
|
|
|
- if (s && s != StringTable->EmptyString())
|
|
|
|
- dFree(s);
|
|
|
|
- break;
|
|
|
|
- default:
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (data != NULL)
|
|
|
|
|
|
+ if (hasAllocatedData())
|
|
{
|
|
{
|
|
dFree(data);
|
|
dFree(data);
|
|
data = NULL;
|
|
data = NULL;
|
|
}
|
|
}
|
|
-
|
|
|
|
- type = ConsoleValueType::cvNULL;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
public:
|
|
public:
|