Skip to content

Commit b3121ee

Browse files
authored
Merge pull request #240 from ArcOS-Project/izk-more-bugfix
Some bugfixes
2 parents 307a894 + 46f1cb7 commit b3121ee

4 files changed

Lines changed: 17 additions & 12 deletions

File tree

src/apps/components/messagecomposer/MessageComposer/ActionBar.svelte

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919
{#snippet rightContent()}
2020
<IconActionButton icon="paperclip" title="Add attachment" disabled={$sending} onclick={() => process.addAttachment()} />
2121
<Separator />
22-
<IconActionButton icon="trash-2" title="Discard message" disabled={$sending} onclick={() => process.discard()} className="discard-button"/>
23-
<ActionButton suggested disabled={!$title || !$body || !$recipients.length || !$sending} onclick={() => process.send()}>
22+
<IconActionButton
23+
icon="trash-2"
24+
title="Discard message"
25+
disabled={$sending}
26+
onclick={() => process.discard()}
27+
className="discard-button"
28+
/>
29+
<ActionButton suggested disabled={!$title || !$body || !$recipients.length} loading={$sending} onclick={() => process.send()}>
2430
Send
2531
</ActionButton>
2632
{/snippet}

src/apps/user/mediaplayer/runtime.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class MediaPlayerRuntime extends AppProcess {
144144

145145
return;
146146
}
147-
147+
148148
if (file) {
149149
if (file.endsWith(".arcpl")) this.readPlaylist(file);
150150
else this.readFile([file]);
@@ -411,17 +411,15 @@ export class MediaPlayerRuntime extends AppProcess {
411411
this.url.set(url);
412412
this.windowTitle.set(`${getItemNameFromPath(path)} - Media Player`);
413413
this.windowIcon.set(fileAssociation?.icon || this.getIconCached("MediaPlayerIcon"));
414-
415-
this.parseMetadata(path);
416-
417414
this.Reset();
418415

419416
await Sleep(10);
420417
await this.player?.play();
421418

419+
this.parseMetadata(path);
422420
this.Loaded.set(true);
423-
} catch {
424-
this.failedToPlay();
421+
} catch (e) {
422+
this.failedToPlay(e);
425423
}
426424
}
427425

@@ -585,7 +583,7 @@ export class MediaPlayerRuntime extends AppProcess {
585583
{
586584
title: "Failed to play",
587585
message:
588-
`Media Player failed to play the file you wanted to open. It might not be a (supported) audio or video file. Please try a different file. ${e ?? ""}`.trim(),
586+
`Media Player failed to play the file you wanted to open. It might not be a (supported) audio or video file. Please try a different file.<br><br>Details: ${e ?? ""}`.trim(),
589587
buttons: [{ caption: "Okay", action: () => {}, suggested: true }],
590588
image: "MediaPlayerIcon",
591589
sound: "arcos.dialog.error",

src/ts/servicehost/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class ServiceHost extends Process implements IServiceHost {
4747
service.id = id;
4848

4949
const startResult = await this.startService(id, broadcast);
50-
if (startResult.startsWith("err_")) {
50+
if (startResult.startsWith("err_") && startResult !== "err_startCondition") {
5151
startErrors[service.name] = startResult;
5252
broadcast?.(`Service ${service.name} failed to start.`);
5353
}

src/ts/servicehost/services/MigrationSvc/nodes/IconConfiguration.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { IMigrationNodeConstructor } from "$interfaces/migration";
2+
import type { IIconService } from "$interfaces/services/IconService";
23
import type { IMigrationService } from "$interfaces/services/MigrationSvc";
34
import type { MigrationResult } from "$types/migrations";
45
import { MigrationNode } from "../node";
@@ -12,10 +13,10 @@ export class IconConfigurationMigration extends MigrationNode {
1213
}
1314

1415
async runMigration(): Promise<MigrationResult> {
15-
const service = this.svc.host.getService<any>("IconService");
16+
const service = this.svc.host.getService<IIconService>("IconService");
1617
const icons = service?.defaultConfiguration();
1718

18-
service?.Configuration.update((v: any) => {
19+
service?.Icons.update((v: any) => {
1920
for (const icon in icons) {
2021
if (!v[icon]) {
2122
v[icon] = icons[icon];

0 commit comments

Comments
 (0)