diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-05-07 00:34:02 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-05-07 00:34:02 +0100 |
| commit | 20eb5b4204ab6fe42dd21beceb702956122d9915 (patch) | |
| tree | 4679dc767a586f7ac381d163c1f8486a89ca9096 /netfs/unittests/mockFuse.cpp | |
| parent | Add additional addition operators to safe for increment/pointers (diff) | |
| download | netfs-20eb5b4204ab6fe42dd21beceb702956122d9915.tar.bz2 netfs-20eb5b4204ab6fe42dd21beceb702956122d9915.tar.xz netfs-20eb5b4204ab6fe42dd21beceb702956122d9915.zip | |
Simplified and fixed up combined settings in fuseapp
Diffstat (limited to 'netfs/unittests/mockFuse.cpp')
| -rw-r--r-- | netfs/unittests/mockFuse.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/netfs/unittests/mockFuse.cpp b/netfs/unittests/mockFuse.cpp index 35bc61d..a1cf29b 100644 --- a/netfs/unittests/mockFuse.cpp +++ b/netfs/unittests/mockFuse.cpp @@ -32,6 +32,7 @@ FuseMock::connectToService() throw std::runtime_error("Invalid service proxy: " + testEndpoint); } daemonSettings = service->getSettings(); + combinedSettings = combineSettings(*daemonSettings, clientSettings); } } |