summaryrefslogtreecommitdiffhomepage
path: root/windows/nsis-plugins/src/driverlogic/context.cpp
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2019-11-26 12:39:59 +0100
committerDavid Lönnhager <david.l@mullvad.net>2019-11-26 12:39:59 +0100
commit5da52fa32fef57959968c4f631d804414e058a4e (patch)
treecf979da9f08f985480768568682b2b91c7cdee4e /windows/nsis-plugins/src/driverlogic/context.cpp
parent81c4801cb8c42b7a61ca1893fb559faa56a0d7d7 (diff)
parent667c6912b0d8cff5976151e95042030ec0f34d79 (diff)
downloadmullvadvpn-5da52fa32fef57959968c4f631d804414e058a4e.tar.xz
mullvadvpn-5da52fa32fef57959968c4f631d804414e058a4e.zip
Merge branch 'installer-fix'
Diffstat (limited to 'windows/nsis-plugins/src/driverlogic/context.cpp')
-rw-r--r--windows/nsis-plugins/src/driverlogic/context.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/windows/nsis-plugins/src/driverlogic/context.cpp b/windows/nsis-plugins/src/driverlogic/context.cpp
index 33e66da0ab..42394e25e3 100644
--- a/windows/nsis-plugins/src/driverlogic/context.cpp
+++ b/windows/nsis-plugins/src/driverlogic/context.cpp
@@ -81,7 +81,8 @@ std::set<Context::NetworkAdapter> GetTapAdapters(const std::set<Context::Network
return tapAdapters;
}
-void LogAdapters(const std::wstring &description, const std::set<Context::NetworkAdapter> &adapters)
+template<typename T>
+void LogAdapters(const std::wstring &description, const T &adapters)
{
//
// Flatten the information so we can log it more easily.
@@ -239,6 +240,7 @@ Context::NetworkAdapter Context::getNewAdapter()
if (added.size() != 1)
{
LogAdapters(L"Enumerable network adapters", m_currentState);
+ LogAdapters(L"Added TAP adapters", added);
throw std::runtime_error("Unable to identify recently added TAP adapter");
}