From 87ec6b86c643646d9740a69be9f2b19bd483f0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sun, 30 Aug 2026 23:29:36 +0000
Subject: [PATCH] Fix API selection in standalone example. (#3944)

---
 examples/common/entry/entry.cpp  | 36 ++++++++++++++++----------------
 examples/common/example-glue.cpp |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp
index 6eba5c428..30e876f38 100644
--- a/examples/common/entry/entry.cpp
+++ b/examples/common/entry/entry.cpp
@@ -648,27 +648,23 @@ restart:
 			{
 				selected = app;
 			}
-#if 0
-			DBG("%c %s, %s"
-				, app == selected ? '>' : ' '
-				, app->getName()
-				, app->getDescription()
-				);
-#endif // 0
 		}
 
 		int32_t result = bx::kExitSuccess;
 		s_restartApp[0] = '\0';
-		if (0 == s_numApps)
+
+		char  extraArgsBuf[256];
+		char  tokenBuf[256];
+		char* extraArgv[32];
+		const char* restartArgv[64];
+
+		int argc = _argc;
+		const char* const* argv = _argv;
+
+		if (0 != bx::strLen(s_restartArgs) )
 		{
-			result = ::_main_(_argc, (char**)_argv);
-		}
-		else if (0 != bx::strLen(s_restartArgs) )
-		{
-			char extraArgsBuf[256];
 			bx::strCopy(extraArgsBuf, BX_COUNTOF(extraArgsBuf), s_restartArgs);
 
-			const char* restartArgv[64];
 			int restartArgc = 0;
 
 			if (0 < _argc)
@@ -676,9 +672,7 @@ restart:
 				restartArgv[restartArgc++] = _argv[0];
 			}
 
-			char* extraArgv[32];
 			int extraArgc;
-			char tokenBuf[256];
 			uint32_t tokenBufSize = sizeof(tokenBuf);
 			bx::tokenizeCommandLine(extraArgsBuf, tokenBuf, tokenBufSize, extraArgc, extraArgv, BX_COUNTOF(extraArgv) );
 
@@ -687,11 +681,17 @@ restart:
 				restartArgv[restartArgc++] = extraArgv[ii];
 			}
 
-			result = runApp(getCurrentApp(selected), restartArgc, restartArgv);
+			argc = restartArgc;
+			argv = restartArgv;
+		}
+
+		if (0 == s_numApps)
+		{
+			result = ::_main_(argc, (char**)argv);
 		}
 		else
 		{
-			result = runApp(getCurrentApp(selected), _argc, _argv);
+			result = runApp(getCurrentApp(selected), argc, argv);
 		}
 
 		if (0 != bx::strLen(s_restartApp) )
diff --git a/examples/common/example-glue.cpp b/examples/common/example-glue.cpp
index 759fd1018..ffc5d360b 100644
--- a/examples/common/example-glue.cpp
+++ b/examples/common/example-glue.cpp
@@ -173,7 +173,7 @@ static const char* getPciIdName(uint16_t _pciId)
 	case BGFX_PCI_ID_ARM:                 return "ARM";
 	case BGFX_PCI_ID_INTEL:               return "Intel";
 	case BGFX_PCI_ID_MICROSOFT:           return "Microsoft";
-	case BGFX_PCI_ID_NVIDIA:              return "nVidia";
+	case BGFX_PCI_ID_NVIDIA:              return "Nvidia";
 	case BGFX_PCI_ID_SOFTWARE_RASTERIZER: return "Software Rasterizer";
 	default: break;
 	}
@@ -371,7 +371,7 @@ void showExampleDialog(entry::AppI* _app, const char* _errorText)
 				case BGFX_PCI_ID_AMD:                 items[ii] = "AMD";                 break;
 				case BGFX_PCI_ID_APPLE:               items[ii] = "Apple";               break;
 				case BGFX_PCI_ID_INTEL:               items[ii] = "Intel";               break;
-				case BGFX_PCI_ID_NVIDIA:              items[ii] = "nVidia";              break;
+				case BGFX_PCI_ID_NVIDIA:              items[ii] = "Nvidia";              break;
 				case BGFX_PCI_ID_MICROSOFT:           items[ii] = "Microsoft";           break;
 				case BGFX_PCI_ID_ARM:                 items[ii] = "ARM";                 break;
 				case BGFX_PCI_ID_SOFTWARE_RASTERIZER: items[ii] = "Software Rasterizer"; break;