summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2014-11-10 23:29:28 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2014-11-10 23:29:28 +0000
commit91662977ebed1fa3b68ed811b936a9c2d2b36a4b (patch)
tree6b429628532cdb7114209afa3977542120f71389 /amiga
parent5776b39b8d6cb45e38c6c7a05ef03fccccc176dc (diff)
downloadnetsurf-91662977ebed1fa3b68ed811b936a9c2d2b36a4b.tar.gz
netsurf-91662977ebed1fa3b68ed811b936a9c2d2b36a4b.tar.bz2
Show error instead of warning requester when essential library fails to open.
Diffstat (limited to 'amiga')
-rw-r--r--amiga/libs.c8
-rw-r--r--amiga/misc.h1
2 files changed, 7 insertions, 2 deletions
diff --git a/amiga/libs.c b/amiga/libs.c
index 3cc84cb68..f296341cc 100644
--- a/amiga/libs.c
+++ b/amiga/libs.c
@@ -17,10 +17,12 @@
*/
#include "amiga/libs.h"
+#include "amiga/misc.h"
#include "utils/utils.h"
#include "utils/log.h"
#include <proto/exec.h>
+#include <proto/utility.h>
#define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL) \
LOG(("Opening %s v%d", LIB, LIBVER)); \
@@ -32,8 +34,10 @@
} else { \
LOG(("Failed to open %s v%d", LIB, LIBVER)); \
if(FAIL == true) { \
- warn_user("CompError", LIB); \
- return false; \
+ STRPTR error = ASPrintf("Unable to open %s v%d", LIB, LIBVER); \
+ ami_misc_fatal_error(error); \
+ FreeVec(error); \
+ return false; \
} \
}
diff --git a/amiga/misc.h b/amiga/misc.h
index 836372f18..33313036f 100644
--- a/amiga/misc.h
+++ b/amiga/misc.h
@@ -21,6 +21,7 @@
#include <exec/types.h>
extern struct gui_file_table *amiga_file_table;
+struct Window;
char *translate_escape_chars(const char *s);
void ami_misc_fatal_error(const char *message);