diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx index 8ac9d7aed9..c715d5975c 100644 --- a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx +++ b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx @@ -563,11 +563,16 @@ search_for_valid_displaymode(DXScreenData &scrn, wdxdisplay8_cat.error() << "EnumAdapterDisplayMode failed for device #" << scrn.CardIDNum << D3DERRORSTRING(hr); - exit(1); + continue; } if ((dispmode.Width!=RequestedX_Size) || (dispmode.Height!=RequestedY_Size)) { + if (bVerboseMode) { + wdxdisplay8_cat.info() + << "Mode dimension found " << dispmode.Width << "x" << dispmode.Height + << ": continuing onto next mode\n"; + } continue; } @@ -602,7 +607,7 @@ search_for_valid_displaymode(DXScreenData &scrn, wdxdisplay8_cat.error() << "CheckDeviceFormat failed for device #" << scrn.CardIDNum << D3DERRORSTRING(hr); - exit(1); + continue; } } diff --git a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx index 2c9155bdbc..bfe98389fa 100755 --- a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx +++ b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx @@ -582,11 +582,16 @@ search_for_valid_displaymode(DXScreenData &scrn, wdxdisplay9_cat.error() << "EnumAdapterDisplayMode failed for device #" << scrn.CardIDNum << D3DERRORSTRING(hr); - exit(1); + continue; } if ((dispmode.Width!=RequestedX_Size) || (dispmode.Height!=RequestedY_Size)) { + if (bVerboseMode) { + wdxdisplay9_cat.info() + << "Mode dimension found " << dispmode.Width << "x" << dispmode.Height + << ": continuing onto next mode\n"; + } continue; } @@ -621,7 +626,7 @@ search_for_valid_displaymode(DXScreenData &scrn, wdxdisplay9_cat.error() << "CheckDeviceFormat failed for device #" << scrn.CardIDNum << D3DERRORSTRING(hr); - exit(1); + continue; } }