Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a deadlock that would occur when loading Twitch badges #2756

merged 2 commits into from May 8, 2021


Copy link

@pajlada pajlada commented May 8, 2021

Pull request checklist:

  • was updated, if applicable


@pajlada pajlada enabled auto-merge (squash) May 8, 2021 13:19
@pajlada pajlada merged commit 6f6ccb8 into master May 8, 2021
@pajlada pajlada deleted the fix/twitchbadges-deadlock branch May 8, 2021 13:29
vaehx added a commit to vaehx/chatterino2 that referenced this pull request May 10, 2021
* chatterino/master:
  Added system message on new date (Chatterino#2748)
  /live split for channels going live (Chatterino#1998)
  Fix newlines in stream title causing text in header to go out of bounds (Chatterino#2755)
  Added clickable hosting messages (Chatterino#2752)
  Add ability to disable precompiled headers with CMake (Chatterino#2727)
  Fix a deadlock that would occur when loading Twitch badges (Chatterino#2756)
  Automod info (Chatterino#2744)
  Fix automod messages not being parsed/showing up properly (Chatterino#2742)
  Fixed login expired message highlight every tab (Chatterino#2735)
GabeEddyT added a commit to GabeEddyT/chatterino2 that referenced this pull request May 25, 2021
Release v2.3.2

- Major: New split for channels going live! /live. (Chatterino#1797)
- Minor: Added a message that displays a new date on new day. (Chatterino#1016)
- Minor: Hosting messages are now clickable. (Chatterino#2655)
- Minor: Messages held by automod are now shown to the user. (Chatterino#2626)
- Minor: Load 100 blocked users rather than the default 20. (Chatterino#2772)
- Bugfix: Fixed a potential crashing issue related to the browser extension. (Chatterino#2774)
- Bugfix: Strip newlines from stream titles to prevent text going off of split header (Chatterino#2755)
- Bugfix: Automod messages now work properly again. (Chatterino#2682)
- Bugfix: `Login expired` message no longer highlights all tabs. (Chatterino#2735)
- Bugfix: Fix a deadlock that would occur during user badge loading. (Chatterino#1704, Chatterino#2756)
- Bugfix: Tabbing in `Select a channel to open` is now consistent. (Chatterino#1797)
- Bugfix: Fix Ctrl + Backspace not closing colon emote picker. (Chatterino#2780)
- Bugfix: Approving/denying AutoMod messages works again. (Chatterino#2779)
- Dev: Migrated AutoMod approve/deny endpoints to Helix. (Chatterino#2779)
- Dev: Migrated Get Cheermotes endpoint to Helix. (Chatterino#2440)

# gpg: directory '/c/Users/gtroy/.gnupg' created
# gpg: keybox '/c/Users/gtroy/.gnupg/pubring.kbx' created
# gpg: Signature made Sun May 16 15:05:25 2021 EDT
# gpg:                using RSA key 16CA5983F9FDD6EB599AAA70911916E0523B22F6
# gpg: Can't check signature: No public key

# Conflicts:
#	src/widgets/settingspages/GeneralPage.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

1 participant