X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/57ae549a3b51ba148315ff4e64da089203cc7c02..94fc2a6d3148acc30d1b0415336a1c2259632a18:/Constructor/src/and.cpp

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index fbee412..4e0534e 100644
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -25,10 +25,12 @@ And::~And()
 bool And::on_button_press_event(GdkEventButton *event)
 {
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		CItem::logic_connect = true;
-		CItem::gate_id = ID;
+		if ( CItem::logic_connect ) {
+			CItem::gate_id = ID;
+			WorkPlace::pointed = ID;
+		}
 		combo_entry->set_text(name);
-		WorkPlace::pointed = ID;
+		
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -99,7 +101,7 @@ void And::save(FILE *archivo)
 	dato += c_img;
 	dato += c_x;
 	dato += c_y;
-	for ( int i=0; i<=vec_connector.size()-1; i++) {
+	for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
 		if ( vec_connector[i].type == IN ) {
 			dato += "\t\t<entrada>";
 			dato += vec_connector[i].name_dest + "</entrada>\n";
@@ -118,9 +120,9 @@ bool And::check_connection()
 	t_logic_connector temp;
 	std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
 	while ( i != workplace->lista_lineas_in.end() ) {
-		if ( (*i).logic->get_id() == ID ) {
+		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
 			temp.type = OUT;
-			temp.name_dest = (*i).store->get_name();
+			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
 			cant_out++;
 		}
@@ -129,9 +131,9 @@ bool And::check_connection()
 
 	i = workplace->lista_lineas_out.begin();
 	while ( i != workplace->lista_lineas_out.end() ) {
-		if ( (*i).logic->get_id() == ID ) {
+		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
 			temp.type = IN;
-			temp.name_dest = (*i).store->get_name();
+			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
 			cant_in++;
 		}