aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoodale <goodale@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2004-11-05 22:25:20 +0000
committergoodale <goodale@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2004-11-05 22:25:20 +0000
commite0ce59b32ec94c74ec7997e80dabd8969cab1833 (patch)
tree5bb46f2009ce11343ab889e1996d613baf86e593
parente1ae4834168802fcbbeb4b79a4d2cdfd06295009 (diff)
Fix pausing and single stepping, and have termination work from
pause mode. git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@215 1faa4e14-9dd3-4be0-9f0e-ffe519881164
-rw-r--r--src/Content.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Content.c b/src/Content.c
index 77e6578..cb49695 100644
--- a/src/Content.c
+++ b/src/Content.c
@@ -894,7 +894,7 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data)
SetToCString(message,
"<td><input type=\"radio\" name=\"runstate\" ");
- ConcatCString(message, pause ? "checked=\"checked\"" : "");
+ ConcatCString(message, pause ? "" : "checked=\"checked\"");
ConcatCString(message,
" value=\"RUN\" /> RUN</td>\n");
HTTP_SendString(request, message);
@@ -1014,7 +1014,8 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data)
@@*/
static int ControlSet(const cGH *cctkGH, httpRequest *request)
{
- DECLARE_CCTK_PARAMETERS
+ DECLARE_CCTK_PARAMETERS;
+
String *message = String_New();
const char *value = HTTP_ArgumentValue(request,"runstate");
@@ -1023,6 +1024,10 @@ static int ControlSet(const cGH *cctkGH, httpRequest *request)
switch(*value)
{
case 'T' : HTTP_SteerQueue(CCTK_THORNSTRING, "terminate", "yes");
+ if(pause)
+ {
+ HTTP_SteerQueue(CCTK_THORNSTRING, "pause", "no");
+ }
ControlTerminationPage(cctkGH, request);
break;
case 'P' : HTTP_SteerQueue(CCTK_THORNSTRING, "pause", "yes");