Merge pull request #298 from reupen/bugfix/buttons-toolbar-relative-p…

…aths Correct loading of images with relative paths in the buttons toolbar
reupen · Mar 6, 2020 · 358bdb8 · 358bdb8
2 parents c79d5c2 + 6ca3f17
commit 358bdb8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change log
 
+## 1.4.1
+
+### Bug fixes
+
+* A regression in the buttons toolbar, which may have caused the loading of custom images with relative paths to fail, was fixed. [[#298](https://github.com/reupen/columns_ui/pull/298)]
+
 ## 1.4.0
 
 ### Bug fixes

diff --git a/foo_ui_columns/buttons_button_image.cpp b/foo_ui_columns/buttons_button_image.cpp
@@ -34,7 +34,7 @@ void ButtonsToolbar::ButtonImage::load(const Button::CustomImage& p_image)
             GetSystemMetrics(SM_CYSMICON), LR_LOADFROMFILE);
     else {
         try {
-            m_bm = cui::wic::create_hbitmap_from_path(p_image.m_path).release();
+            m_bm = cui::wic::create_hbitmap_from_path(fullPath).release();
         } catch (const std::exception& ex) {
             fbh::print_to_console(u8"Buttons toolbar – loading image failed: ", ex.what());
             m_bm = nullptr;