diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-01-07 12:53:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-07 12:55:36 +0200 |
| commit | 989f0fa8dbe6af56aa33fc6b8c63364811f8635c (patch) | |
| tree | 2c7c42da82478b361ebfce83a9bf8d71d8db05dc | |
| parent | 0f6f21346ec989dc31130e6bdc196a2293fcbb2e (diff) | |
The OpenGL Windows driver blacklist file should be in share, not user config
We don't want a potentially outdated copy to be used.
Besides, when it was in the user profile, it did not exist the first
time after an installation, or a user profile removal, when we
attempted to read it.
Change-Id: I21290090a3bbb44864730dff84c81e80add89fb3
| -rw-r--r-- | vcl/Package_opengl_blacklist.mk | 2 | ||||
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk index b858a56eaa24..35dbfcb0b273 100644 --- a/vcl/Package_opengl_blacklist.mk +++ b/vcl/Package_opengl_blacklist.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl)) -$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ +$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_FOLDER)/opengl,\ opengl_blacklist_windows.xml \ )) diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 744319447de5..2f3ec80e16e4 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -910,10 +910,10 @@ namespace { OUString getBlacklistFile() { - OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/config/opengl_blacklist_windows.xml"); + OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER); rtl::Bootstrap::expandMacros(url); - return url; + return url + "/opengl/opengl_blacklist_windows.xml"; } |