From 65191b077d25ae390feb0c84eda4d517d3668bf0 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 30 Jun 2009 16:20:16 +0000 Subject: [PATCH] (svn r16702) -Change: don't implicitly fall back to the null/dedicated (video) drivers, but show an error message that no driver could be found. You can still explicitly start the null drivers thought. --- src/driver.cpp | 4 ++-- src/video/null_v.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver.cpp b/src/driver.cpp index 1feffcc545..dd0da98b55 100644 --- a/src/driver.cpp +++ b/src/driver.cpp @@ -61,8 +61,8 @@ Driver *DriverFactoryBase::SelectDriver(const char *name, Driver::Type type) if (GetDrivers().size() == 0) return NULL; if (StrEmpty(name)) { - /* Probe for this driver */ - for (int priority = 10; priority >= 0; priority--) { + /* Probe for this driver, but do not fall back to dedicated/null! */ + for (int priority = 10; priority > 0; priority--) { Drivers::iterator it = GetDrivers().begin(); for (; it != GetDrivers().end(); ++it) { DriverFactoryBase *d = (*it).second; diff --git a/src/video/null_v.h b/src/video/null_v.h index c45a5a46c8..80d9d58d92 100644 --- a/src/video/null_v.h +++ b/src/video/null_v.h @@ -27,7 +27,7 @@ public: class FVideoDriver_Null: public VideoDriverFactory { public: - static const int priority = 1; + static const int priority = 0; /* virtual */ const char *GetName() { return "null"; } /* virtual */ const char *GetDescription() { return "Null Video Driver"; } /* virtual */ Driver *CreateInstance() { return new VideoDriver_Null(); }