X-Git-Url: http://git.tdb.fi/?p=gldbg.git;a=blobdiff_plain;f=source%2Fgldbg.cpp;h=dd0476d4168db408f8a990792f94cc0e436c466a;hp=c37e65552a3684c5681284e5821959829d79648b;hb=e6f542d42b566193f55bb6727834f709ac6c1762;hpb=8ac18c1745c64441dbbdc130b1c396dcde9b21a7

diff --git a/source/gldbg.cpp b/source/gldbg.cpp
index c37e655..dd0476d 100644
--- a/source/gldbg.cpp
+++ b/source/gldbg.cpp
@@ -79,7 +79,19 @@ void GlDbg::launch()
 	process.launch();
 	close(fds[1]);
 
-	breakpoints.clear();
+	for(BreakList::iterator i=breakpoints.begin(); i!=breakpoints.end(); )
+	{
+		if(i->has_owner(0))
+		{
+			i->owners.clear();
+			i->owners.push_back(0);
+			send_breakpoint(i->function, i->flag, 0);
+			++i;
+		}
+		else
+			breakpoints.erase(i++);
+	}
+
 	for(ToolList::iterator i=tools.begin(); i!=tools.end(); ++i)
 		(*i)->process_started();
 }
@@ -95,6 +107,15 @@ void GlDbg::hold()
 	send(pkt);
 }
 
+void GlDbg::send_breakpoint(unsigned short func, unsigned char set_flags, unsigned char clear_flags)
+{
+	GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
+	packet_write_short(pkt, func);
+	packet_write_char(pkt, set_flags);
+	packet_write_char(pkt, clear_flags);
+	send(pkt);
+}
+
 void GlDbg::set_breakpoint(unsigned short func, unsigned char flag, Tool *owner)
 {
 	Breakpoint *bp = (func ? get_breakpoint(func, flag) : 0);
@@ -108,11 +129,8 @@ void GlDbg::set_breakpoint(unsigned short func, unsigned char flag, Tool *owner)
 			breakpoints.back().add_owner(owner);
 		}
 
-		GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
-		packet_write_short(pkt, func);
-		packet_write_char(pkt, flag);
-		packet_write_char(pkt, 0);
-		send(pkt);
+		if(process.get_state()>=Process::RUNNING)
+			send_breakpoint(func, flag, 0);
 	}
 }
 
@@ -135,11 +153,8 @@ void GlDbg::clear_breakpoint(unsigned short func, unsigned char flag, Tool *owne
 					break;
 				}
 
-			GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
-			packet_write_short(pkt, func);
-			packet_write_char(pkt, 0);
-			packet_write_char(pkt, flag);
-			send(pkt);
+			if(process.get_state()>=Process::RUNNING)
+				send_breakpoint(func, 0, flag);
 		}
 	}
 }