Skip to content

Commit

Permalink
Merge pull request #51 from agentsofthesystem/develop
Browse files Browse the repository at this point in the history
Create Release 0.12 Beta

Bug Fixes
  • Loading branch information
jreed1701 committed Mar 6, 2024
2 parents 8108bc1 + 78e2fe8 commit 871e6b6
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
7 changes: 6 additions & 1 deletion application/alembic/versions/database_v3.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ def upgrade():
"game_state",
sa.String(length=25),
default=GameStates.NOT_STATE.value,
nullable=False,
nullable=True,
),
insert_after="",
insert_before="",
)

# Set back to nullable and fill with a default value.
batch_op.alter_column(
"game_state", nullable=False, server_default=GameStates.NOT_STATE.value
)

# ### end Alembic commands ###


Expand Down
18 changes: 12 additions & 6 deletions application/alembic/versions/database_v4.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,27 @@ def upgrade():
"game_steam_build_branch",
sa.String(length=256),
default="public",
nullable=False,
nullable=True,
),
insert_after="public",
insert_before="public",
)

batch_op.add_column(
sa.Column(
"game_steam_build_id",
sa.Integer(),
default=-1,
nullable=False,
nullable=True,
),
insert_after=-1,
insert_before=-1,
)

# Set back to nullable and fill with a default value.
batch_op.alter_column(
"game_steam_build_branch", nullable=False, server_default="public"
)

# Set back to nullable and fill with a default value.
batch_op.alter_column(
"game_steam_build_id", nullable=False, server_default="-1"
)

op.create_index("ix_actions_action_id", "actions", ["action_id"], unique=False)
Expand Down
11 changes: 11 additions & 0 deletions application/gui/launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,17 @@ def initialize(self, with_server=False):
initialization_data = None

if with_server:
# Check that one is not already running.
is_already_there = None
is_already_there = self._globals._client.architect.get_health()
if is_already_there == "Alive":
message = QMessageBox()
message.setText(
"Error: Unable to start. This application is already running!"
)
message.exec()
return

# Launch Flask Server
self._spawn_server_on_thread()

Expand Down

0 comments on commit 871e6b6

Please sign in to comment.