Skip to content

Commit

Permalink
Merge branch 'master' into development/dobby-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
MFransen69 authored Oct 15, 2024
2 parents 91f6998 + a697962 commit 00bc00e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Linux build template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
Thunder:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

strategy:
matrix:
Expand Down
4 changes: 3 additions & 1 deletion Source/extensions/bluetooth/UUID.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ namespace Bluetooth {
}
explicit UUID(const string& uuidStr)
{
FromString(uuidStr);
if (FromString(uuidStr) == false) {
_uuid[0] = 0;
}
}
UUID(const UUID& copy)
{
Expand Down

0 comments on commit 00bc00e

Please sign in to comment.