mirror of
https://github.com/glfw/glfw.git
synced 2026-09-18 22:55:46 +00:00
Various error system fixes.
This commit is contained in:
+7
-5
@@ -65,6 +65,7 @@ void _glfwSetError(int error, const char* description)
|
|||||||
|
|
||||||
//========================================================================
|
//========================================================================
|
||||||
// Returns the current error value
|
// Returns the current error value
|
||||||
|
// This function may be called without GLFW having been initialized
|
||||||
//========================================================================
|
//========================================================================
|
||||||
|
|
||||||
GLFWAPI int glfwGetError(void)
|
GLFWAPI int glfwGetError(void)
|
||||||
@@ -77,6 +78,7 @@ GLFWAPI int glfwGetError(void)
|
|||||||
|
|
||||||
//========================================================================
|
//========================================================================
|
||||||
// Returns a string representation of the specified error value
|
// Returns a string representation of the specified error value
|
||||||
|
// This function may be called without GLFW having been initialized
|
||||||
//========================================================================
|
//========================================================================
|
||||||
|
|
||||||
GLFWAPI const char* glfwErrorString(int error)
|
GLFWAPI const char* glfwErrorString(int error)
|
||||||
@@ -102,8 +104,7 @@ GLFWAPI const char* glfwErrorString(int error)
|
|||||||
case GLFW_PLATFORM_ERROR:
|
case GLFW_PLATFORM_ERROR:
|
||||||
return "A platform-specific error occurred";
|
return "A platform-specific error occurred";
|
||||||
default:
|
default:
|
||||||
// TODO: Set GLFW_INVALID_ENUM here?
|
return "ERROR: UNKNOWN ERROR TOKEN";
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,9 +117,10 @@ GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun)
|
|||||||
{
|
{
|
||||||
if (!_glfwInitialized)
|
if (!_glfwInitialized)
|
||||||
{
|
{
|
||||||
// TODO: Uhm... Hmm...
|
// We can't call _glfwSetError here as _glfwLibrary is uninitialized
|
||||||
|
// This should be the only place outside of _glfwSetError where we set
|
||||||
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
|
// the global error status directly
|
||||||
|
_glfwError = GLFW_NOT_INITIALIZED;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user