Skip to content

Commit

Permalink
merged master
Browse files Browse the repository at this point in the history
Torkus committed May 16, 2023
2 parents b71dea5 + e1bb3d7 commit 27e4306
Showing 4 changed files with 20 additions and 10 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -50,6 +50,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

## 6.1.2 - 2023-05-16

* issue #402, fixed a freezing bug in the search results, introduced in 5.1.0 (2022-03-02).
- if the 'full' catalogue were selected, searching and selecting a result would freeze the GUI.
- it may possibly have disabled mouse events as well, depending on your window manager.
- No definite cause found, however the bug was quacking suspicously like a deadlock/livelock.
- Thanks to @sergen213 for their help and feedback.

## 6.1.1 - 2023-05-07

### Fixed
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -32,14 +32,14 @@ Arch Linux users can install `strongbox` from the [AUR](https://aur.archlinux.or

For other Linux users:

1. download: [./releases/strongbox](https://github.com/ogri-la/strongbox/releases/download/6.1.1/strongbox)
1. download: [./releases/strongbox](https://github.com/ogri-la/strongbox/releases/download/6.1.2/strongbox)
2. make executable: `chmod +x strongbox`
3. run: `./strongbox`

If you're on macOS or having a problem with the binary or just prefer Java `.jar` files (requires Java 11+):

1. download: [./releases/strongbox-6.1.1-standalone.jar](https://github.com/ogri-la/strongbox/releases/download/6.1.1/strongbox-6.1.1-standalone.jar)
2. run: `java -jar strongbox-6.1.1-standalone.jar`
1. download: [./releases/strongbox-6.1.2-standalone.jar](https://github.com/ogri-la/strongbox/releases/download/6.1.2/strongbox-6.1.2-standalone.jar)
2. run: `java -jar strongbox-6.1.2-standalone.jar`

## Usage

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<groupId>ogri-la</groupId>
<artifactId>strongbox</artifactId>
<packaging>jar</packaging>
<version>6.1.1</version>
<version>6.1.2</version>
<name>strongbox</name>
<description>World Of Warcraft Addon Manager</description>
<url>https://github.com/ogri-la/strongbox</url>
@@ -18,7 +18,7 @@
<url>https://github.com/ogri-la/strongbox</url>
<connection>scm:git:git://github.com/ogri-la/strongbox.git</connection>
<developerConnection>scm:git:ssh://[email protected]/ogri-la/strongbox.git</developerConnection>
<tag>e074a679b01f592c2330058d008544707cf7f7ce</tag>
<tag>8d1220551085510b52aed14be3d79586429cea4f</tag>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
12 changes: 7 additions & 5 deletions src/strongbox/cli.clj
Original file line number Diff line number Diff line change
@@ -189,11 +189,13 @@
[:search :filter-by]]
listener (fn [new-state]
(future
(let [{:keys [term results-per-page filter-by]} (:search new-state)
results (core/db-search term results-per-page filter-by)]
(dosync
(clear-selected-search-addons!)
(swap! core/state assoc-in [:search :results] results)))))]
(let [new-search-state (:search new-state)
{:keys [term results-per-page filter-by]} new-search-state
results (core/db-search term results-per-page filter-by)
new-search-state (-> new-search-state
(assoc :results results)
(assoc :selected-result-list []))]
(swap! core/state assoc :search new-search-state))))]
(doseq [path path-list]
(core/state-bind path listener))))

0 comments on commit 27e4306

Please sign in to comment.