Merge branch 'fix/glfwcreatewindow-failure' of https://github.com/gouletr/emscripten into incoming
Conflicts: AUTHORS
This commit is contained in:
Коммит
e7aa8a2f04
1
AUTHORS
1
AUTHORS
|
@ -204,4 +204,5 @@ a license to everyone to use it as detailed in LICENSE.)
|
|||
* Kagami Hiiragi <kagami@genshiken.org>
|
||||
* Jan Bölsche <jan@lagomorph.de>
|
||||
* Sebastian Matthes <sebastianmatthes@outlook.com> (copyright owned by Volkswagen AG)
|
||||
* Robert Goulet <robert.goulet@autodesk.com> (copyright owned by Autodesk, Inc.)
|
||||
|
||||
|
|
|
@ -627,6 +627,9 @@ var LibraryGLFW = {
|
|||
Module.ctx = Browser.createContext(Module['canvas'], true, true, contextAttributes);
|
||||
}
|
||||
|
||||
// If context creation failed, do not return a valid window
|
||||
if (!Module.ctx) return 0;
|
||||
|
||||
// Get non alive id
|
||||
var win = new GLFW.Window(id, width, height, title, monitor, share);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче