diff --git a/.travis.yml b/.travis.yml index 0629aeb6..09209bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: before_install: - cd .. - - git clone --depth=1 --branch=develop https://github.com/qPCR4vir/nana-demo.git nana-demo + - git clone --depth=1 --branch=master https://github.com/qPCR4vir/nana-demo.git nana-demo - export PATH="$HOME/bin:$PATH" - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true - chmod -R +x /tmp/tools diff --git a/source/gui/filebox.cpp b/source/gui/filebox.cpp index 06dfed84..f2417087 100644 --- a/source/gui/filebox.cpp +++ b/source/gui/filebox.cpp @@ -1516,14 +1516,24 @@ namespace nana path_type parent_path{ str }; str += (len + 1); - - while(*str) + + // if only one file was selected, the ofn.lpstrFile + // is returning only that file, without any parent + if (!*str) { - len = ::wcslen(str); - targets.emplace_back(parent_path / path_type{str}); - str += (len + 1); + targets.emplace_back(parent_path); + impl_->path = parent_path.parent_path().u8string(); + } + else + { + while(*str) + { + len = ::wcslen(str); + targets.emplace_back(parent_path / path_type{str}); + str += (len + 1); + } + impl_->path = parent_path.u8string(); } - impl_->path = parent_path.u8string(); } else {